diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-29 17:16:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-29 17:16:36 -0700 |
| commit | 553cbf0a8f19c669bed82028988aa977558ef551 (patch) | |
| tree | c0aecc102d1d3bf26f56dc69775d1657a456e2d4 /fs/locks.c | |
| parent | 27fb8d7b1fe7c2fa2d7c1f243b899793e1b080e0 (diff) | |
| parent | 76ad4b8ebd5c68c8bf490bdb1fb4dcbc266e5223 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/ps3: Update ps3_defconfig
powerpc/ps3: Update platform maintainer
powerpc/pseries: Flush lazy kernel mappings after unplug operations
powerpc/numa: Add form 1 NUMA affinity
powerpc/fsl-booke: Fix CONFIG_RELOCATABLE support on FSL Book-E ppc32
powerpc: 2.6.34 update of defconfigs for embedded 6xx/7xxx, 8xx, 8xxx
powerpc/mpc8xxx defconfigs - turn off SYSFS_DEPRECATED
powerpc/83xx: configure SIL SATA driver in 83xx-wide defconfig
powerpc/83xx: enable EPOLL syscall in defconfig
powerpc/83xx: add RTC drivers in 83xx defconfig
powerpc/fsl-cpm: Configure clock correctly for SCC
powerpc/fsl_booke: Correct test for MMU_FTR_BIG_PHYS
powerpc/85xx/86xx: Fix build w/ CONFIG_PCI=n
Diffstat (limited to 'fs/locks.c')
0 files changed, 0 insertions, 0 deletions