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)
commit559300bc0ef7ccd541656f1189d38e7088389559
treecd1682881ca4246e9c5a1e8632be4bdd9d9706c6
parent5416bf33f92a4104dbcd6062bf377c8421ca3cfd
parent22763c5cf3690a681551162c15d34d935308c8d7
Merge commit 'v2.6.32'

Conflicts:
arch/avr32/mach-at32ap/include/mach/cpu.h