summaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/nvram.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-07 16:59:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-07 16:59:43 -0700
commit7b51ba38d9baca207152d1c97ec793cfb673a6cd (patch)
tree581d9340f2bca78e755469611c224b050d439f59 /include/asm-powerpc/nvram.h
parent4f81c5350b44bcc501ab6f8a089b16d064b4d2f6 (diff)
parent739db07f82767e7634176d18af2acbe77b11fd42 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: Revert "PCI: Correct last two HP entries in the bfsort whitelist"
Diffstat (limited to 'include/asm-powerpc/nvram.h')
0 files changed, 0 insertions, 0 deletions