From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 29 Apr 2012 19:19:13 +0000 (-0700)
Subject: Merge tag 'staging-3.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v3.4-rc5~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=de9e24eda331bbefb9195a4d646c786bdcbba7d4;p=karo-tx-linux.git

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
---

de9e24eda331bbefb9195a4d646c786bdcbba7d4