Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 16 Jun 2010 16:08:13 +0000 (18:08 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 16 Jun 2010 16:08:13 +0000 (18:08 +0200)
commitf1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b
treec2c130a74be25b0b2dff992e1a195e2728bdaadd
parentfd0961ff67727482bb20ca7e8ea97b83e9de2ddb
parent7e27d6e778cd87b6f2415515d7127eba53fe5d02
Merge branch 'master' into for-next
24 files changed:
arch/ia64/kvm/kvm-ia64.c
arch/sparc/boot/btfixupprep.c
arch/x86/kernel/apic/apic.c
drivers/dma/at_hdmac.c
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
drivers/ide/ide-gd.c
drivers/infiniband/hw/cxgb4/qp.c
drivers/net/gianfar.c
drivers/net/ibm_newemac/core.c
drivers/net/ksz884x.c
drivers/net/ll_temac_main.c
drivers/scsi/fcoe/fcoe.c
drivers/staging/comedi/drivers/usbdux.c
drivers/staging/pohmelfs/inode.c
drivers/staging/rt2860/common/cmm_wpa.c
drivers/staging/rtl8192e/r8190_rtl8256.c
fs/ext4/extents.c
fs/ext4/super.c
fs/ocfs2/super.c
include/linux/ide.h
include/linux/netdevice.h
kernel/cpuset.c
lib/random32.c
sound/soc/fsl/mpc8610_hpcd.c