tree bf13f53713e5f8dec8621eee4c5a281fd64d7abd
parent 8d7d1adcd77ffa2e0edec79d4e48a7b1a1943c47
parent 89f21cc050d5eed8eeffee5b46297fb7a74ef9dd
author Linus Torvalds <torvalds@linux-foundation.org> 1335727153 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1335727153 -0700
mergetag object 89f21cc050d5eed8eeffee5b46297fb7a74ef9dd
 type commit
 tag staging-3.4-rc4
 tagger Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1335715221 -0700
 
 Staging tree fixes for 3.4-rc4
 
 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.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iEYEABECAAYFAk+dZeoACgkQMUfUDdst+yl3YACghMr131zQer1yIJbXvcTGstR3
 TrkAn2X3gPqHnrXUdlGS5zUxeTl0fL5S
 =wG0/
 -----END PGP SIGNATURE-----

Merge tag 'staging-3.4-rc4' of git://git.kernel.org/pub/scm/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