From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 11 Oct 2012 23:15:20 +0000 (+1100)
Subject: Merge remote-tracking branch 'microblaze/next'
X-Git-Tag: next-20121012~66
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=732f679cbcb2e8f18ca652cbf9aff25c555e9ee5;p=karo-tx-linux.git

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

732f679cbcb2e8f18ca652cbf9aff25c555e9ee5
diff --cc arch/microblaze/include/asm/Kbuild
index 8653072d7e9f,3c3996142438..4a159da23633
--- a/arch/microblaze/include/asm/Kbuild
+++ b/arch/microblaze/include/asm/Kbuild
@@@ -1,5 -1,2 +1,3 @@@
- include include/asm-generic/Kbuild.asm
  
- header-y  += elf.h
  generic-y += clkdev.h
 +generic-y += exec.h