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
..
boards	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
boot
cchips
configs	sh: mach-systemh: Kill off dead board.	2010-10-29 19:11:56 +09:00
drivers
include	sh: wire up accept4 syscall (non-multiplexed path)	2010-12-14 17:58:10 +09:00
kernel	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
lib
lib64
math-emu
mm	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
oprofile
tools	sh: mach-systemh: Kill off dead board.	2010-10-29 19:11:56 +09:00
Kconfig	sh: Enable deprecated IRQ chip APIs for MFD and GPIOLIB drivers.	2010-12-13 14:59:51 +09:00
Kconfig.cpu
Kconfig.debug
Makefile	sh: mach-edosk7705: Kill off machtype, consolidate board def.	2010-10-29 19:38:19 +09:00