]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge commit 'v2.6.32'
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Mon, 14 Dec 2009 18:23:03 +0000 (19:23 +0100)
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Mon, 14 Dec 2009 18:23:03 +0000 (19:23 +0100)
Conflicts:
arch/avr32/mach-at32ap/include/mach/cpu.h


Trivial merge