Merge branch 'master' into for-next
commit6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1
authorJiri Kosina <jkosina@suse.cz>
Fri, 23 Apr 2010 00:08:44 +0000 (23 02:08 +0200)
committerJiri Kosina <jkosina@suse.cz>
Fri, 23 Apr 2010 00:08:44 +0000 (23 02:08 +0200)
tree797676a336b050bfa1ef879377c07e541b9075d6
parent4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f
parentc81eddb0e3728661d1585fbc564449c94165cc36
Merge branch 'master' into for-next
28 files changed:
MAINTAINERS
arch/mips/sibyte/bcm1480/irq.c
arch/mips/sibyte/sb1250/irq.c
drivers/acpi/osl.c
drivers/acpi/power.c
drivers/ata/ata_piix.c
drivers/char/bsr.c
drivers/firewire/ohci.c
drivers/gpu/drm/drm_bufs.c
drivers/gpu/drm/i915/intel_display.c
drivers/isdn/hardware/mISDN/hfcmulti.c
drivers/isdn/hisax/hfc4s8s_l1.c
drivers/net/ps3_gelic_wireless.c
drivers/net/smsc911x.c
drivers/pci/pci.c
drivers/regulator/core.c
drivers/rtc/rtc-stk17ta8.c
drivers/scsi/bfa/include/defs/bfa_defs_cee.h
drivers/scsi/bfa/include/defs/bfa_defs_status.h
drivers/spi/spi_mpc8xxx.c
drivers/usb/wusbcore/wa-xfer.c
drivers/virtio/virtio_pci.c
fs/jfs/jfs_dmap.c
fs/omfs/inode.c
include/linux/kfifo.h
kernel/cgroup.c
mm/memcontrol.c
net/ipv4/ipmr.c