aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/powermac/pci.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-09-29 19:28:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-09-29 19:28:26 -0700
commit0ecdb12a7ae983a012f662373fb3ccc22b920ed8 (patch)
treee067c1b262b5c07fdbbee9296651d7182ddc2ebe /arch/powerpc/platforms/powermac/pci.c
parent5fe858b5b76be3cb1b1cf3ea40b7ca6706f8329c (diff)
parenta681887f7b0f8b7698e4b22f1191015424fa96e4 (diff)
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] cio: fix cio_tpi ignoring adapter interrupts [S390] gmap: always up mmap_sem properly [S390] Do not clobber personality flags on exec
Diffstat (limited to 'arch/powerpc/platforms/powermac/pci.c')
0 files changed, 0 insertions, 0 deletions