Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ... Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.		2010-12-22 18:57:02 +01:00
..
aoa
arm
atmel
core	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
drivers
i2c
isa
mips
oss
parisc
pci	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
pcmcia
ppc
sh
soc	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
sparc
spi
synth
usb
ac97_bus.c
Kconfig
last.c
Makefile
sound_core.c
sound_firmware.c