Merge 3.5-rc4 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Jun 2012 16:31:00 +0000 (09:31 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Jun 2012 16:31:00 +0000 (09:31 -0700)
commitbcc66c0b8881f88459f9ac21038455bcafacdc6e
treeb402e677253c3fc1038ca4a52fc54fc223261133
parent1c1b86215730ef07d8851c2247b9ecf73038d05d
parent6b16351acbd415e66ba16bf7d473ece1574cf0bc
Merge 3.5-rc4 into staging-next

This picks up the staging changes made in 3.5-rc4 so that everyone can sync up
properly.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/iio/Kconfig
drivers/staging/gdm72xx/netlink_k.c
drivers/staging/rtl8712/usb_intf.c
drivers/staging/zcache/zcache-main.c
fs/pstore/platform.c