From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 21 Jun 2013 13:02:04 +0000 (+0200)
Subject: Merge branch 'next/late' into for-next
X-Git-Tag: next-20130628~18^2~25
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=da06710e81c8ea7011c0bb11a09977131f51615b;p=karo-tx-linux.git

Merge branch 'next/late' into for-next

Conflicts:
	arch/arm/mach-shmobile/setup-r8a7778.c
---

da06710e81c8ea7011c0bb11a09977131f51615b