]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'pci-current/for-linus'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Apr 2013 23:01:12 +0000 (10:01 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Apr 2013 23:01:12 +0000 (10:01 +1100)
1  2 
drivers/acpi/pci_root.c

Simple merge