Merge branch 'for-next' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Mon, 8 Mar 2010 15:55:37 +0000 (16:55 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 8 Mar 2010 15:55:37 +0000 (16:55 +0100)
commit318ae2edc3b29216abd8a2510f3f80b764f06858
treece595adde342f57f379d277b25e4dd206988a052
parent25cf84cf377c0aae5dbcf937ea89bc7893db5176
parent3e58974027b04e84f68b964ef368a6cd758e2f84
Merge branch 'for-next' into for-linus

Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
101 files changed:
Documentation/filesystems/proc.txt
Documentation/power/runtime_pm.txt
arch/arm/common/clkdev.c
arch/arm/mach-davinci/include/mach/i2c.h
arch/arm/mach-omap2/board-3630sdp.c
arch/arm/mach-omap2/board-zoom-peripherals.c
arch/arm/mach-u300/core.c
arch/arm/mach-u300/include/mach/debug-macro.S
arch/ia64/sn/kernel/setup.c
arch/s390/kernel/sclp.S
arch/sparc/kernel/perf_event.c
arch/x86/kernel/pci-dma.c
arch/x86/kernel/ptrace.c
arch/x86/kernel/tsc.c
arch/x86/kernel/vmiclock_32.c
crypto/Kconfig
drivers/acpi/dock.c
drivers/ata/libata-core.c
drivers/ata/libata-sff.c
drivers/ata/pata_acpi.c
drivers/ata/pata_pcmcia.c
drivers/char/agp/intel-agp.c
drivers/char/hvc_iseries.c
drivers/char/serial167.c
drivers/char/tty_io.c
drivers/gpu/drm/nouveau/nouveau_bios.c
drivers/gpu/drm/nouveau/nouveau_drv.h
drivers/gpu/drm/radeon/radeon_state.c
drivers/input/serio/i8042.c
drivers/media/video/gspca/ov519.c
drivers/mfd/sm501.c
drivers/mmc/card/sdio_uart.c
drivers/net/chelsio/sge.c
drivers/net/cs89x0.c
drivers/net/cxgb3/sge.c
drivers/net/davinci_emac.c
drivers/net/e1000e/82571.c
drivers/net/e1000e/lib.c
drivers/net/igb/igb_main.c
drivers/net/ks8851.c
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/smsc9420.c
drivers/net/spider_net.c
drivers/net/sungem.c
drivers/net/tehuti.c
drivers/net/tokenring/tms380tr.c
drivers/net/tun.c
drivers/net/typhoon.c
drivers/net/ucc_geth.c
drivers/net/wimax/i2400m/fw.c
drivers/net/wireless/ath/ar9170/main.c
drivers/net/wireless/rt2x00/rt2500usb.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/rt2x00/rt2x00debug.c
drivers/net/wireless/rt2x00/rt2x00dev.c
drivers/net/wireless/rt2x00/rt2x00queue.c
drivers/net/wireless/rt2x00/rt61pci.c
drivers/net/wireless/rt2x00/rt73usb.c
drivers/net/wireless/zd1211rw/zd_mac.c
drivers/platform/x86/thinkpad_acpi.c
drivers/scsi/libfc/fc_fcp.c
drivers/scsi/lpfc/lpfc_els.c
drivers/scsi/lpfc/lpfc_scsi.c
drivers/scsi/sd.c
drivers/usb/musb/musb_regs.h
drivers/usb/serial/cypress_m8.c
drivers/usb/serial/opticon.c
drivers/usb/serial/symbolserial.c
fs/binfmt_elf_fdpic.c
fs/bio.c
fs/cifs/cifssmb.c
fs/ext3/super.c
fs/ext4/mballoc.c
fs/ext4/super.c
fs/gfs2/ops_fstype.c
fs/jbd/transaction.c
fs/locks.c
fs/namei.c
fs/nfsd/nfs4xdr.c
fs/ocfs2/dlmglue.c
fs/ocfs2/extent_map.c
fs/reiserfs/bitmap.c
fs/udf/inode.c
include/linux/mmzone.h
include/linux/sched.h
kernel/irq/chip.c
kernel/ksysfs.c
kernel/params.c
kernel/sched_cpupri.c
kernel/trace/ring_buffer.c
kernel/trace/trace.h
mm/slub.c
net/ipv4/tcp_timer.c
net/mac80211/mesh_plink.c
net/netfilter/nf_conntrack_sip.c
net/netfilter/xt_hashlimit.c
security/selinux/avc.c
sound/pci/rme9652/hdspm.c
sound/soc/codecs/wm8990.c
tools/perf/perf.c