Jiri Kosina e75d660672 Merge branch 'master' into for-next ...

Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.

Conflicts:
	drivers/net/ethernet/realtek/r8169.c

2012-04-08 21:48:52 +02:00

..

aoa

…

arm

ARM: cleanups of io includes

2012-03-29 18:02:10 -07:00

atmel

…

core

Documentation: remove references to /etc/modprobe.conf

2012-03-30 16:03:15 -07:00

drivers

Documentation: remove references to /etc/modprobe.conf

2012-03-30 16:03:15 -07:00

firewire

IEEE 1394 (FireWire) subsystem updates post v3.3:

2012-03-22 20:31:15 -07:00

i2c

[media] tea575x: fix HW seek

2012-03-19 11:28:52 -03:00

isa

Merge branch 'master' into for-next

2012-04-08 21:48:52 +02:00

mips

…

oss

sound fixes for 3.4-rc1

2012-03-30 10:59:52 -07:00

parisc

…

pci

Merge branch 'master' into for-next

2012-04-08 21:48:52 +02:00

pcmcia

…

ppc

…

sh

…

soc

Merge branch 'akpm' (Andrew's patch-bomb)

2012-04-05 15:30:34 -07:00

sparc

…

spi

…

synth

…

usb

Merge branch 'topic/misc' into for-linus

2012-03-18 18:22:33 +01:00

ac97_bus.c

…

Kconfig

…

last.c

…

Makefile

…

sound_core.c

…

sound_firmware.c

…