Greg Kroah-Hartman 8f5f90a872 Merge 3.8-rc5 into staging-next ...

This resolves a merge issue with a iio driver, and the zram code.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2013-01-25 21:25:02 -08:00

..

goldfish

goldfish: Add a FIXME note to the pipe driver

2013-01-24 13:51:38 -08:00

olpc

Platform: OLPC: move global variables into priv struct

2012-07-31 23:27:31 -04:00

x86

asus-laptop: Fix potential invalid pointer dereference

2013-01-07 12:33:48 -05:00

Kconfig

goldfish: add QEMU pipe driver

2013-01-24 13:49:34 -08:00

Makefile

goldfish: add the goldfish virtual bus

2013-01-24 13:49:34 -08:00