diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 00:02:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 00:02:42 -0400 |
commit | 1989425a3aed215f1accd5d8019b18b345166a63 (patch) | |
tree | edf01f8cddce137588a501d74eedb43e98911c62 /mm/swapfile.c | |
parent | 0fc2f137226eff4c9dd90864dda5c237474c3ec5 (diff) | |
parent | e32e78c5ee8aadef020fbaecbe6fb741ed9029fd (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: fix build with make 3.82
Revert "Input: appletouch - fix integer overflow issue"
memblock: Fix memblock_is_region_reserved() to return a boolean
powerpc: Trim defconfigs
powerpc: fix i8042 module build error
sound/soc: mpc5200_psc_ac97: Use gpio pins for cold reset
powerpc/5200: add mpc5200_psc_ac97_gpio_reset
Diffstat (limited to 'mm/swapfile.c')
0 files changed, 0 insertions, 0 deletions