Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Feb 2010 15:17:54 +0000 (07:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Feb 2010 15:17:54 +0000 (07:17 -0800)
commit5993fe31c0e9646233ff4ecea32e3c899036eda9
treef089d05ab2729e0eea89dc0e93cab9d5186b47f4
parent53910146dfc118d9f86eeb88775ccd6fafebb09d
parentcbf8de1620cdb1abb5b0618ff561004f816064fc
Merge git://git./linux/kernel/git/hskinnemoen/avr32-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
  avr32: clean up memory allocation in at32_add_device_mci
  arch/avr32: Fix build failure for avr32 caused by typo