Merge branch 'master' into tj-percpu

2026-09-26 18:16:26 +00:00 · 2009-01-31 14:36:00 +09:00 · 2009-01-31 14:36:00 +09:00 · da2c0b021c
commit da2c0b021c
parent 795f99b61d 33bfad54b5
58 changed files with 533 additions and 283 deletions
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
--- a/Documentation/networking/alias.txt
+++ b/Documentation/networking/alias.txt
--- a/2
+++ b/2
--- a/block/blk-barrier.c
+++ b/block/blk-barrier.c
--- a/block/blk-core.c
+++ b/block/blk-core.c
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
--- a/block/blktrace.c
+++ b/block/blktrace.c
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
--- a/drivers/net/gianfar_mii.c
+++ b/drivers/net/gianfar_mii.c
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
--- a/drivers/net/skfp/skfddi.c
+++ b/drivers/net/skfp/skfddi.c
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
--- a/drivers/net/smsc9420.c
+++ b/drivers/net/smsc9420.c
--- a/drivers/net/tulip/21142.c
+++ b/drivers/net/tulip/21142.c
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
--- a/drivers/net/ucc_geth.h
+++ b/drivers/net/ucc_geth.h
--- a/drivers/net/ucc_geth_mii.c
+++ b/drivers/net/ucc_geth_mii.c
--- a/drivers/net/ucc_geth_mii.h
+++ b/drivers/net/ucc_geth_mii.h
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
--- a/drivers/net/wimax/i2400m/debugfs.c
+++ b/drivers/net/wimax/i2400m/debugfs.c
--- a/drivers/net/wimax/i2400m/driver.c
+++ b/drivers/net/wimax/i2400m/driver.c
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
--- a/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c
--- a/drivers/serial/jsm/jsm_tty.c
+++ b/drivers/serial/jsm/jsm_tty.c
--- a/fs/bio-integrity.c
+++ b/fs/bio-integrity.c
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
--- a/mm/mmap.c
+++ b/mm/mmap.c
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
--- a/net/wimax/debugfs.c
+++ b/net/wimax/debugfs.c
--- a/net/wimax/stack.c
+++ b/net/wimax/stack.c
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c