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
..
configs	defconfig reduction	2010-08-14 22:26:53 +02:00
dig	x86, ia64: convert to use generic dma_map_ops struct	2009-01-06 14:06:57 +01:00
hp	SCSI host lock push-down	2010-11-16 13:33:23 -08:00
include/asm	taskstats: use real microsecond granularity for CPU times	2010-10-27 18:03:17 -07:00
kernel	convert get_sb_pseudo() users	2010-10-29 04:16:33 -04:00
kvm	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
lib	[IA64] fix csum_ipv6_magic()	2009-09-02 09:14:48 -07:00
mm	[IA64] Fix spinaphore down_spin()	2010-06-30 10:46:16 -07:00
oprofile	[IA64] implement ticket locks for Itanium	2009-09-25 08:42:16 -07:00
pci	ACPI: pci_root: pass acpi_pci_root to arch-specific scan	2010-04-04 00:29:53 -04:00
scripts	scripts: change scripts to use system python instead of env	2010-02-02 14:33:56 +01:00
sn	Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	2010-10-22 10:52:56 -07:00
uv	[IA64] wrong attribute of HUB chip written in uv_setup()	2010-02-26 11:20:41 -08:00
xen	[IA64] xen: use ARRAY_SIZE macro in xen_pv_ops.c	2010-09-23 14:26:30 -07:00
install.sh	kbuild: use INSTALLKERNEL to select customized installkernel script	2009-09-20 12:18:14 +02:00
Kconfig	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
Kconfig.debug
Makefile	Merge commit 'v2.6.35' into kbuild/kbuild	2010-08-04 13:59:13 +02:00
module.lds