summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/pci_root.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-11-21 14:38:49 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-11-21 14:38:49 -0500
commit1e60896fe07307baa5f3ca1a220dfa9792657352 (patch)
treeb68ba91a72b1b421d37914e4201fc672f12d86ae /drivers/acpi/pci_root.c
parentad66786718989c20c91e855baa40371e01daf0a1 (diff)
parenteea54c8ec971d4759c541dba351477dafc39ce54 (diff)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Conflicts: drivers/net/wireless/iwlwifi/pcie/trans.c
Diffstat (limited to 'drivers/acpi/pci_root.c')
0 files changed, 0 insertions, 0 deletions