summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-06-26Merge commit 'blackfin/for-linus'Stephen Rothwell
2008-06-26Merge commit 'acpi/test'Stephen Rothwell
Conflicts: arch/x86/kernel/process.c arch/x86/kernel/srat_32.c drivers/acpi/processor_throttling.c drivers/acpi/sleep/main.c
2008-06-26Merge commit 'infiniband/for-next'Stephen Rothwell
2008-06-26Merge commit 'xfs/master'Stephen Rothwell
2008-06-26Merge commit 'nfs/linux-next'Stephen Rothwell
2008-06-26Merge commit 'libata/NEXT'Stephen Rothwell
2008-06-26Merge branch 'quilt/ide'Stephen Rothwell
2008-06-26Merge commit 'kbuild/master'Stephen Rothwell
2008-06-26Merge commit 'jfs/next'Stephen Rothwell
2008-06-26Merge commit 'sh/master'Stephen Rothwell
2008-06-26Merge commit 's390/features'Stephen Rothwell
Conflicts: drivers/s390/block/dasd.c drivers/s390/block/dasd_eckd.c drivers/s390/block/dasd_fba.c drivers/s390/char/tape_core.c drivers/s390/cio/device_fsm.c drivers/s390/cio/qdio.c drivers/s390/net/claw.c drivers/s390/net/ctcm_main.c drivers/s390/net/lcs.c
2008-06-26Revert "V4L/DVB (8049): budget-ci: Add support for Technotrend budget C-1501 ↵Stephen Rothwell
dvb-c card" This reverts commit 020c648971a8e49b15848668ac1e100f8c84c804.
2008-06-26Merge commit 'v4l-dvb/stable'Stephen Rothwell
2008-06-26Merge commit 'avr32/avr32-arch'Stephen Rothwell
2008-06-26Merge branch 'quilt/kernel-doc'Stephen Rothwell
2008-06-26Merge branch 'quilt/i2c'Stephen Rothwell
Conflicts: drivers/i2c/i2c-core.c
2008-06-26Merge commit 'hid/mm'Stephen Rothwell
2008-06-26Merge commit 'pci/linux-next'Stephen Rothwell
Conflicts: arch/x86/kernel/setup_64.c arch/x86/pci/irq.c arch/x86/pci/pci.h include/linux/device.h
2008-06-26Merge commit 'x86/auto-x86-next'Stephen Rothwell
Conflicts: arch/x86/kernel/entry_32.S arch/x86/kernel/process_32.c arch/x86/kernel/process_64.c
2008-06-26Merge commit 'timers/auto-timers-next'Stephen Rothwell
2008-06-26Merge commit 'stackprotector/auto-stackprotector-next'Stephen Rothwell
2008-06-26Merge commit 'sched/auto-sched-next'Stephen Rothwell
Conflicts: kernel/Makefile kernel/sched_rt.c
2008-06-26Merge commit 'safe-poison-pointers/auto-safe-poison-pointers-next'Stephen Rothwell
2008-06-26Merge commit 'genirq/auto-genirq-next'Stephen Rothwell
2008-06-26Merge commit 'ftrace/auto-ftrace-next'Stephen Rothwell
2008-06-26Merge commit 'cpus4096/auto-cpus4096-next'Stephen Rothwell
2008-06-26Merge commit 'tip-core/auto-core-next'Stephen Rothwell
2008-06-26Merge branch 'quilt/usb'Stephen Rothwell
2008-06-26Merge branch 'quilt/driver-core'Stephen Rothwell
2008-06-26Merge branch 'quilt/usb.current'Stephen Rothwell
2008-06-26Merge branch 'quilt/driver-core.current'Stephen Rothwell
2008-06-26Merge commit 'wireless-current/master'Stephen Rothwell
2008-06-26Merge commit 'arm-current/master'Stephen Rothwell
2008-06-26Merge commit 'sparc-current/master'Stephen Rothwell
2008-06-26Merge commit 'net-current/master'Stephen Rothwell
2008-06-26Merge commit 'scsi-rc-fixes/master'Stephen Rothwell
2008-06-26misc:down_nowait-kernel_printkRusty Russell
down_trylock -> down_try in kernel/printk.c Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2008-06-26misc:down_nowait-xfsRusty Russell
down_trylock -> down_try in xfs Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Cc: xfs@oss.sgi.com
2008-06-26misc:down_nowait-fs_reiserfs_journalRusty Russell
down_trylock -> down_try in fs/reiserfs/journal.c Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2008-06-26misc:down_nowait-drivers_usb_gadget_inodeRusty Russell
down_trylock -> down_try in drivers/usb/gadget/inode.c Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2008-06-26misc:down_nowait-drivers_usb_core_usbRusty Russell
down_trylock -> down_try for usb_trylock_device() I took the liberty of reversing the sense of usb_trylock_device(): it only has one user anyway. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2008-06-26misc:down_nowait-drivers_scsi_aacraid_commsupRusty Russell
down_trylock -> down_try in drivers/scsi/aacraid/commsup.c Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2008-06-26misc:down_nowait-drivers_net_wireless_airoRusty Russell
down_trylock -> down_try in drivers/net/wireless/airo.c Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2008-06-26misc:down_nowait-drivers_net_irda_sir_devRusty Russell
down_trylock -> down_try in drivers/net/irda/sir_dev.c Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2008-06-26misc:down_nowait-drivers_net_3c527Rusty Russell
down_trylock -> down_try in drivers/net/3c527.c Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2008-06-26misc:down_nowait-drivers_md_dm-raid1Rusty Russell
down_trylock -> down_try in drivers/md/dm-raid1.c Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2008-06-26misc:down_nowait-drivers_input_serio_hp_sdc_mlcRusty Russell
down_trylock -> down_try in drivers/input/serio/hp_sdc_mlc.c Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2008-06-26misc:down_nowait-drivers_input_serio_hil_mlcRusty Russell
down_trylock -> down_try in drivers/input/serio/hil_mlc.c Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2008-06-26misc:down_nowait-drivers_infiniband_core_user_madRusty Russell
down_trylock -> down_try in drivers/infiniband/core/user_mad.c Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2008-06-26misc:down_nowait-drivers_char_viotapeRusty Russell
down_trylock -> down_try in drivers/char/viotape.c Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-13 04:51:25 +0000