Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 26 Jan 2007 22:48:53 +0000 (14:48 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 26 Jan 2007 22:48:53 +0000 (14:48 -0800)
commitbb385942967fb7e0ff8cb8fea7a32561ef609a1a
treea30ecace0d1d7c3a6140817b0c2d47e73b38a9b6
parentd312c8f81c9810d669cdf13b28f1a5d474738eaf
parent4fe4f4ace5a667122f8dd04302e19e46d99e3594
Merge branch 'for-linus' of git://atmel.no/~hskinnemoen/linux/kernel/avr32

* 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32:
  [AVR32] Update ATSTK1000 defconfig: Enable macb by default
  [AVR32] Export clear_page symbol