]> err.no Git - linux-2.6/commitdiff
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)
* 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32:
  [AVR32] Update ATSTK1000 defconfig: Enable macb by default
  [AVR32] Export clear_page symbol


Trivial merge