alistair23-linux/drivers/staging/sb105x
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
..
Kconfig staging: Make SystemBase PCI Multiport UART only for x86 2013-01-07 09:32:45 -08:00
Makefile staging: Add SystemBase Multi-2/PCI driver 2012-11-16 06:58:09 -08:00
sb_mp_register.h staging: sb105x: clean up interface type test 2013-01-17 16:43:20 -08:00
sb_pci_mp.c Merge 3.8-rc5 into staging-next 2013-01-25 21:25:02 -08:00
sb_pci_mp.h staging: Add SystemBase Multi-2/PCI driver 2012-11-16 06:58:09 -08:00
sb_ser_core.h staging: Add SystemBase Multi-2/PCI driver 2012-11-16 06:58:09 -08:00