git.maquefel.me Git - linux.git/commit

author	Jiri Kosina <jkosina@suse.cz>
	Wed, 22 Dec 2010 17:57:02 +0000 (18:57 +0100)
committer	Jiri Kosina <jkosina@suse.cz>
	Wed, 22 Dec 2010 17:57:02 +0000 (18:57 +0100)
commit	4b7bd364700d9ac8372eff48832062b936d0793b
tree	0dbf78c95456a0b02d07fcd473281f04a87e266d	tree \| snapshot
parent	c0d8768af260e2cbb4bf659ae6094a262c86b085	commit \| diff
parent	90a8a73c06cc32b609a880d48449d7083327e11a	commit \| diff

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.

52 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/pm24xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/pm34xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/serial.c	diff1 \|	diff2 \|	blob \| history
arch/mips/jz4740/board-qi_lb60.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/head_32.S	diff1 \|	diff2 \|	blob \| history
drivers/acpi/sleep.c	diff1 \|	diff2 \|	blob \| history
drivers/atm/iphase.c	diff1 \|	diff2 \|	blob \| history
drivers/base/power/main.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/intel_mid_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/edac/edac_core.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_backlight.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/via-camera.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/zoran/zoran.h	diff1 \|	diff2 \|	blob \| history
drivers/message/fusion/mptsas.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000/e1000_main.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/asus-laptop.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/thinkpad_acpi.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/toshiba_acpi.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/a100u2w.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/bfa/bfa_fcpim.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/bfa/bfa_fcs_lport.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/dc395x.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/libfc/fc_fcp.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/lpfc/lpfc_attr.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/lpfc/lpfc_hbadisc.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/lpfc/lpfc_sli.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/megaraid.h	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_sysfs.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sym53c8xx_2/sym_glue.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/atmel_spi.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/olpc_dcon/olpc_dcon.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/samsung-laptop/samsung-laptop.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/stradis/stradis.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/misc/iowarrior.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/musb_gadget.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/ext4.h	diff1 \|	diff2 \|	blob \| history
fs/ext4/inode.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/linux-2.6/xfs_super.c	diff1 \|	diff2 \|	blob \| history
kernel/debug/kdb/kdb_main.c	diff1 \|	diff2 \|	blob \| history
kernel/perf_event.c	diff1 \|	diff2 \|	blob \| history
kernel/power/hibernate.c	diff1 \|	diff2 \|	blob \| history
kernel/power/suspend.c	diff1 \|	diff2 \|	blob \| history
kernel/power/swap.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
sound/core/pcm_native.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/max98088.c	diff1 \|	diff2 \|	blob \| history
sound/soc/s3c24xx/smdk_spdif.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/pm24xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/pm34xx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/serial.c	diff1 \|	diff2 \|	blob \| history
arch/mips/jz4740/board-qi_lb60.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/head_32.S	diff1 \|	diff2 \|	blob \| history
drivers/acpi/sleep.c	diff1 \|	diff2 \|	blob \| history
drivers/atm/iphase.c	diff1 \|	diff2 \|	blob \| history
drivers/base/power/main.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/intel_mid_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/edac/edac_core.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_backlight.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/via-camera.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/zoran/zoran.h	diff1 \|	diff2 \|	blob \| history
drivers/message/fusion/mptsas.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000/e1000_main.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/asus-laptop.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/thinkpad_acpi.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/toshiba_acpi.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/a100u2w.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/bfa/bfa_fcpim.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/bfa/bfa_fcs_lport.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/dc395x.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/libfc/fc_fcp.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/lpfc/lpfc_attr.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/lpfc/lpfc_hbadisc.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/lpfc/lpfc_sli.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/megaraid.h	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_sysfs.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sym53c8xx_2/sym_glue.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/atmel_spi.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/olpc_dcon/olpc_dcon.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/samsung-laptop/samsung-laptop.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/stradis/stradis.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/misc/iowarrior.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/musb_gadget.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/ext4.h	diff1 \|	diff2 \|	blob \| history
fs/ext4/inode.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/linux-2.6/xfs_super.c	diff1 \|	diff2 \|	blob \| history
kernel/debug/kdb/kdb_main.c	diff1 \|	diff2 \|	blob \| history
kernel/perf_event.c	diff1 \|	diff2 \|	blob \| history
kernel/power/hibernate.c	diff1 \|	diff2 \|	blob \| history
kernel/power/suspend.c	diff1 \|	diff2 \|	blob \| history
kernel/power/swap.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
sound/core/pcm_native.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/max98088.c	diff1 \|	diff2 \|	blob \| history
sound/soc/s3c24xx/smdk_spdif.c	diff1 \|	diff2 \|	blob \| history