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

..

acpi

PCI changes for the v3.8 merge window:

2012-12-13 12:14:47 -08:00

asm-generic

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

2013-01-23 13:31:15 -08:00

clocksource

…

crypto

crypto: cast5/cast6 - move lookup tables to shared module

2012-12-06 17:16:26 +08:00

drm

Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel

2013-01-11 07:52:48 +10:00

keys

…

linux

Merge 3.8-rc5 into staging-next

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

math-emu

…

media

[media] V4L: Add driver for S3C24XX/S3C64XX SoC series camera interface

2012-11-28 09:43:34 -02:00

memory

…

misc

…

net

Merge branch 'master' of git://1984.lsi.us.es/nf

2012-12-28 14:28:17 -08:00

pcmcia

…

ras

…

rdma

UAPI: Remove empty Kbuild files

2013-01-02 17:36:10 -08:00

rxrpc

…

scsi

SCSI misc on 20121212

2012-12-13 19:20:31 -08:00

sound

Merge remote-tracking branch 'asoc/fix/cs4271' into tmp

2013-01-10 12:22:11 +00:00

target

target: Introduce TCM_NO_SENSE

2013-01-10 20:06:08 -08:00

trace

Various bug fixes for ext4. Perhaps the most serious bug fixed is one

2013-01-02 09:57:34 -08:00

uapi

TTY/serial fixes for 3.8-rc4

2013-01-18 14:05:59 -08:00

video

Merge branch 'omap-for-v3.8/fixes-for-merge-window' into omap-for-v3.8/fixes-for-merge-window-v2

2012-12-16 11:28:10 -08:00

xen

Bugfixes:

2012-12-18 12:26:54 -08:00

Kbuild

UAPI: Remove empty Kbuild files

2013-01-02 17:36:10 -08:00