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	sh: boot kernel with SR.BL set	2010-09-30 09:43:32 +09:00
cchips	sh: hd64461: irq_data conversion.	2010-10-27 15:18:15 +09:00
configs	sh: mach-systemh: Kill off dead board.	2010-10-29 19:11:56 +09:00
drivers	sh: pci: Convert to upper/lower_32_bits() helpers.	2010-10-15 06:15:56 +09:00
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	sh: change to new flag variable	2010-09-23 16:18:18 +09:00
lib64	sh64: Kill off special clear_page() implementation.	2009-08-04 17:17:00 +09:00
math-emu	sh: wire up perf alignment and emulation faults.	2010-10-13 06:55:26 +09:00
mm	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
oprofile	sh: oprofile: Make sure the backtrace op is available for timer-fallback.	2010-10-27 17:03:50 +09:00
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	sh: Turn on speculative return for SH7785 and SH7786	2010-02-18 18:54:18 +09:00
Kconfig.debug	sh: Remove old early serial console code V2	2009-12-15 12:07:35 +09:00
Makefile	sh: mach-edosk7705: Kill off machtype, consolidate board def.	2010-10-29 19:38:19 +09:00