Merge remote-tracking branch 'microblaze/next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 24 Oct 2012 00:09:56 +0000 (11:09 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 24 Oct 2012 00:09:56 +0000 (11:09 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Oct 2012 00:09:56 +0000 (11:09 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Oct 2012 00:09:56 +0000 (11:09 +1100)
diff --cc arch/microblaze/include/asm/Kbuild

index 8653072d7e9f061479c5b11c5de056337cfdac7a,3c399614243869b02c9be8d84cd5d7a0cc0e1e0e..4a159da23633dbf359c9886513958ce49e842ce7
--- 1/arch/microblaze/include/asm/Kbuild
--- 2/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
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 24 Oct 2012 00:09:56 +0000 (11:09 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 24 Oct 2012 00:09:56 +0000 (11:09 +1100)