diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-11 10:40:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-11 10:40:28 -0700 |
| commit | e2205a156f4dd727097f7f492bf03aa8920b0071 (patch) | |
| tree | 7c4947406e9e11b5fbe183db4e0ae1943b9a7d15 /arch/s390 | |
| parent | a7ef6a40f700496c60b8f7206fff74fecd67b3a2 (diff) | |
| parent | 13fa00a8780885edcdf0bc53b81e5d0fec71119a (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc: Remove include/linux/harrier_defs.h
powerpc: Do not ignore arch/powerpc/include
powerpc: Delete completed "ppc removal" task from feature removal file
powerpc/mm: Fix attribute confusion with htab_bolt_mapping()
powerpc/pci: Don't keep ISA memory hole resources in the tree
powerpc: Zero fill the return values of rtas argument buffer
powerpc/4xx: Update defconfig files for 2.6.27-rc1
powerpc/44x: Incorrect NOR offset in Warp DTS
powerpc/44x: Warp DTS changes for board updates
powerpc/4xx: Cleanup Warp for i2c driver changes.
powerpc/44x: Adjust warp-nand resource end address
Diffstat (limited to 'arch/s390')
0 files changed, 0 insertions, 0 deletions