Bjorn Helgaas
4c85980429
PCI: Reorder so actual code comes before stubs ...
Consistently use the:
#ifdef CONFIG_PCI_FOO
int pci_foo(...);
#else
static inline int pci_foo(...) { return -1; }
#endif
pattern, instead of sometimes using "#ifndef CONFIG_PCI_FOO".
No functional change.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
2014-01-13 17:01:11 -07:00
ACPICA: Add helper macros to extract bus/segment numbers from HEST table.
2014-01-13 12:17:47 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-11-15 16:47:22 -08:00
drivers: clocksource: add support for ARM architected timer event stream
2013-09-26 09:48:00 +01:00
keys: change asymmetric keys to use common hash definitions
2013-10-25 17:15:18 -04:00
Merge branch 'ttm-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into drm-fixes
2013-11-21 18:46:56 +10:00
For the 3.13 merge window we have a couple of new drivers for the AMS
2013-11-15 16:37:40 -08:00
KEYS: Separate the kernel signature checking keyring from module signing
2013-09-25 17:17:01 +01:00
PCI: Reorder so actual code comes before stubs
2014-01-13 17:01:11 -07:00
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2013-11-18 15:50:07 -08:00
genetlink: fix genl_set_err() group ID
2013-11-21 13:09:43 -05:00
Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', 'qib' and 'srp' into for-next
2013-11-17 08:22:19 -08:00
Main batch of InfiniBand/RDMA changes for 3.13:
2013-11-18 15:36:04 -08:00
Merge remote-tracking branch 'asoc/topic/twl4030' into asoc-next
2013-11-08 10:43:40 +00:00
target_core_alua: Store supported ALUA states
2013-11-20 11:26:37 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
2013-11-22 08:38:55 -08:00
Merge branch 'pci/vc' into next
2013-12-18 14:04:35 -07:00
fbdev changes for 3.13
2013-11-14 14:44:20 +09:00
Features:
2013-11-15 13:34:37 +09:00
4c85980429