From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 9 Sep 2011 01:20:36 +0000 (+1000)
Subject: Merge remote-tracking branch 'at91/at91-next'
X-Git-Tag: next-20110909~99
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=90b3e3322fe6443c2b1e6a0fd22a35e4c420b2c7;p=karo-tx-linux.git

Merge remote-tracking branch 'at91/at91-next'

Conflicts:
	arch/arm/mach-at91/board-usb-a9260.c
---

90b3e3322fe6443c2b1e6a0fd22a35e4c420b2c7