From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Feb 2010 15:17:54 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
X-Git-Tag: Ubuntu-5.0.0-8.9~24295
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5993fe31c0e9646233ff4ecea32e3c899036eda9;p=mirror_ubuntu-disco-kernel.git

Merge git://git.kernel.org/pub/scm/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
---

5993fe31c0e9646233ff4ecea32e3c899036eda9