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
..
boot	ARM: 6503/1: Thumb-2: Restore sensible zImage header layout for CONFIG_THUMB2_KERNEL	2010-11-30 13:44:26 +00:00
common	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
configs	at91: merge all at91rm9200 defconfig in one single file	2010-11-30 10:59:15 +01:00
include/asm	ARM: 6490/1: MM: bugfix: initialize spinlock for init_mm.context	2010-11-23 22:46:12 +00:00
kernel	ARM: 6519/1: kuser: Fix incorrect cmpxchg syscall in kuser helpers	2010-12-04 11:01:12 +00:00
lib	ARM: 6482/2: Fix find_next_zero_bit and related assembly	2010-11-24 20:17:46 +00:00
mach-aaec2000	ARM: 6484/1: fix compile warning in mm/init.c	2010-11-21 22:05:56 +00:00
mach-at91	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
mach-bcmring	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
mach-clps711x	ARM: 6484/1: fix compile warning in mm/init.c	2010-11-21 22:05:56 +00:00
mach-cns3xxx	ARM: cns3xxx: Fix build with CONFIG_PCI=y	2010-11-29 19:19:15 +03:00
mach-davinci	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
mach-dove
mach-ebsa110	ARM: 6484/1: fix compile warning in mm/init.c	2010-11-21 22:05:56 +00:00
mach-ep93xx	ARM: 6462/1: EP93xx: Document DMA M2P API	2010-11-07 16:13:30 +00:00
mach-footbridge	ARM: 6484/1: fix compile warning in mm/init.c	2010-11-21 22:05:56 +00:00
mach-gemini	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
mach-h720x	ARM: 6484/1: fix compile warning in mm/init.c	2010-11-21 22:05:56 +00:00
mach-imx	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
mach-integrator	ARM: 6484/1: fix compile warning in mm/init.c	2010-11-21 22:05:56 +00:00
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-ixp23xx
mach-ixp2000
mach-kirkwood	Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion	2010-11-07 16:10:56 +00:00
mach-ks8695
mach-l7200/include/mach
mach-lh7a40x
mach-loki
mach-lpc32xx	suspend: constify platform_suspend_ops	2010-11-16 14:14:02 +01:00
mach-mmp	ARM: mmp2: remove not used clk_rtc	2010-11-30 20:14:03 +08:00
mach-msm	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
mach-mv78xx0	Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion	2010-11-07 16:10:56 +00:00
mach-mx3	ARM i.MX pcm037 eet: compile fixes	2010-11-15 09:25:03 +01:00
mach-mx5
mach-mx25	mx25: fix spi device registration typo	2010-11-15 09:25:06 +01:00
mach-mxc91231
mach-netx	ARM: 6484/1: fix compile warning in mm/init.c	2010-11-21 22:05:56 +00:00
mach-nomadik
mach-ns9xxx
mach-nuc93x
mach-omap1	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
mach-omap2	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
mach-orion5x	Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion	2010-11-07 16:10:56 +00:00
mach-pnx4008	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
mach-pxa	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
mach-realview	ARM: 6507/1: RealView: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL	2010-11-30 13:44:27 +00:00
mach-rpc	ARM: 6484/1: fix compile warning in mm/init.c	2010-11-21 22:05:56 +00:00
mach-s3c24a0/include/mach
mach-s3c64xx	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
mach-s3c2400
mach-s3c2410	ARM: S3C2410: Adapt h1940-bluetooth to gpiolib changes	2010-11-25 10:58:10 +09:00
mach-s3c2412	ARM S3C24XX: Fix compilation of PM code for S3C2416	2010-12-17 14:45:01 +09:00
mach-s3c2416	ARM S3C24XX: Fix compilation of PM code for S3C2416	2010-12-17 14:45:01 +09:00
mach-s3c2440	ARM: S3C24XX: Fix mess with gpio {set,get}_pull callbacks	2010-12-08 01:04:56 +00:00
mach-s3c2443	ARM: S3C2443: Select properly ARM core type	2010-11-30 08:44:09 +00:00
mach-s5p64x0
mach-s5p6442
mach-s5pc100
mach-s5pv210	ARM: S5PV210: update MAX8998 platform data to get rid of WARN()	2010-12-17 14:47:42 +09:00
mach-s5pv310
mach-sa1100	suspend: constify platform_suspend_ops	2010-11-16 14:14:02 +01:00
mach-shark	ARM: 6484/1: fix compile warning in mm/init.c	2010-11-21 22:05:56 +00:00
mach-shmobile	ARM: mach-shmobile: INTC interrupt priority level demux fix	2010-12-17 19:42:47 +09:00
mach-spear3xx	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
mach-spear6xx	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
mach-stmp37xx
mach-stmp378x
mach-tcc8k
mach-tegra	ARM: tegra: fix regression from addruart rewrite	2010-12-06 20:07:57 -08:00
mach-u300	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
mach-ux500	ARM: 6473/1: Small update to ux500 specific L2 cache code	2010-11-21 22:05:56 +00:00
mach-versatile	ARM: 6484/1: fix compile warning in mm/init.c	2010-11-21 22:05:56 +00:00
mach-vexpress	ARM: 6508/1: vexpress: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL	2010-11-30 13:44:27 +00:00
mach-w90x900
mm	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
nwfpe
oprofile
plat-iop	ARM: 6523/1: iop: ensure sched_clock() is notrace	2010-12-04 13:36:29 +00:00
plat-mxc	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
plat-nomadik	ARM: 6488/1: nomadik: prevent sched_clock() wraparound	2010-11-21 22:05:57 +00:00
plat-omap	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
plat-orion
plat-pxa	mmc: sdhci: 8-bit bus width changes	2010-11-22 15:12:04 -05:00
plat-s3c24xx	ARM: S3C24XX: Fix CONFIG_S3C_DEV_NAND Kconfig entry	2010-12-17 14:44:54 +09:00
plat-s5p
plat-samsung	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
plat-spear
plat-stmp3xxx
plat-tcc
plat-versatile
tools	ARM: Update mach-types	2010-12-12 23:31:02 +00:00
vfp	ARM: 6498/1: vfp: Correct data alignment for CONFIG_THUMB2_KERNEL	2010-11-30 13:44:23 +00:00
Kconfig	ARM: 6534/1: Make CONFIG_FPE_NWFPE depend on !CONFIG_THUMB2_KERNEL	2010-12-14 22:23:34 +00:00
Kconfig-nommu
Kconfig.debug
Makefile