| commit | de9e24eda331bbefb9195a4d646c786bdcbba7d4 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 29 Apr 2012 19:19:13 +0000 (29 12:19 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 29 Apr 2012 19:19:13 +0000 (29 12:19 -0700) | ||
| tree | bf13f53713e5f8dec8621eee4c5a281fd64d7abd | treesnapshot (tar.gz zip) |
| parent | 8d7d1adcd77ffa2e0edec79d4e48a7b1a1943c47 | commitdiff |
| parent | 89f21cc050d5eed8eeffee5b46297fb7a74ef9dd | commitdiff |
Merge tag 'staging-3.4-rc4' of git://git./linux/kernel/git/gregkh/staging
Pull staging tree fixes from Greg Kroah-Hartman:
"Here are some tiny drivers/staging/ bugfixes. Some build fixes that
were recently reported, as well as one kfree bug that is hitting a
number of users."
* tag 'staging-3.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: ozwpan: Fix bug where kfree is called twice.
staging: octeon-ethernet: fix build errors by including interrupt.h
staging: zcache: fix Kconfig crypto dependency
staging: tidspbridge: remove usage of OMAP2_L4_IO_ADDRESS
Pull staging tree fixes from Greg Kroah-Hartman:
"Here are some tiny drivers/staging/ bugfixes. Some build fixes that
were recently reported, as well as one kfree bug that is hitting a
number of users."
* tag 'staging-3.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: ozwpan: Fix bug where kfree is called twice.
staging: octeon-ethernet: fix build errors by including interrupt.h
staging: zcache: fix Kconfig crypto dependency
staging: tidspbridge: remove usage of OMAP2_L4_IO_ADDRESS