| commit | 2b37e9a28afbd11f899738e912fb4a617a74b462 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 27 Feb 2013 03:50:22 +0000 (26 19:50 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 27 Feb 2013 03:50:22 +0000 (26 19:50 -0800) | ||
| tree | 9494e8bfed44e08f47d4b4c6007dc189f7c7896f | treesnapshot (tar.gz zip) |
| parent | a9a07d40bc9c57881555b64fe8bf66fd28e2f13a | commitdiff |
| parent | 711e5b4520986380700e6f095608021cf087170e | commitdiff |
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
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