diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-27 04:50:22 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-27 04:50:22 +0100 |
| commit | 2b37e9a28afbd11f899738e912fb4a617a74b462 (patch) | |
| tree | 9494e8bfed44e08f47d4b4c6007dc189f7c7896f /drivers/net/wireless/iwlegacy/4965.c | |
| parent | Merge branch 'for-upstream' of git://openrisc.net/jonas/linux (diff) | |
| parent | asm-generic: io: Fix ioread16/32be and iowrite16/32be (diff) | |
| download | linux-2b37e9a28afbd11f899738e912fb4a617a74b462.tar.xz linux-2b37e9a28afbd11f899738e912fb4a617a74b462.zip | |
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
Diffstat (limited to 'drivers/net/wireless/iwlegacy/4965.c')
0 files changed, 0 insertions, 0 deletions