Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...
commit0d62950125241a6e6db8e8f14271f098ec7a2da4
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Sun, 12 Oct 2008 13:44:33 +0000 (12 15:44 +0200)
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Sun, 12 Oct 2008 13:44:33 +0000 (12 15:44 +0200)
tree8cdd9e17f6a6ff4cb6166ad12a4d3ed1d45b2dc9
parentb3bc2c5562f06ca34b30f61c5714e96490946c81
parent5e7184ae0dd49456387e8b1cdebc6b2c92fc6d51
Merge branch 'master' of git://git./linux/kernel/git/hskinnemoen/atmel-mci-2.6.28
arch/avr32/boards/atngw100/setup.c
arch/avr32/boards/atstk1000/atstk1002.c
arch/avr32/boards/atstk1000/atstk1004.c
arch/avr32/mach-at32ap/at32ap700x.c