From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Feb 2013 03:50:22 +0000 (-0800)
Subject: Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2b37e9a28afbd11f899738e912fb4a617a74b462;p=linux-beck.git

Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

Pull microblaze update from Michal Simek:
 "Microblaze changes.

  After my discussion with Arnd I have also added there asm-generic io
  patch which is Acked by him and Geert."

* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
  asm-generic: io: Fix ioread16/32be and iowrite16/32be
  microblaze: Do not use module.h in files which are not modules
  microblaze: Fix coding style issues
  microblaze: Add missing return from debugfs_tlb
  microblaze: Makefile clean
  microblaze: Add .gitignore entries for auto-generated files
  microblaze: Fix strncpy_from_user macro
---

2b37e9a28afbd11f899738e912fb4a617a74b462