[prev in list] [next in list] [prev in thread] [next in thread]
List: linux-mips-cvs
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
From: linux-mips () linux-mips ! org
Date: 2009-03-28 17:09:51
Message-ID: S20022008AbZC1RJz/20090328170955Z+3040814 () ftp ! linux-mips ! org
[Download RAW message or body]
Author: Ralf Baechle <ralf@linux-mips.org> Sat Mar 28 18:08:32 2009 +0100
Commit: 8582913608543257aec51385db72f833f1d758fa
Gitweb: http://www.linux-mips.org/g/linux/85829136
Branch: master
---
Documentation/DocBook/mac80211.tmpl | 6
Documentation/feature-removal-schedule.txt | 37
MAINTAINERS | 10
arch/alpha/kernel/entry.S | 3
arch/alpha/kernel/osf_sys.c | 2
arch/ia64/ia32/ia32_entry.S | 2
arch/ia64/kernel/perfmon.c | 2
arch/mips/kernel/linux32.c | 34
arch/mips/kernel/scall64-n32.S | 2
arch/mips/kernel/scall64-o32.S | 2
arch/parisc/kernel/syscall_table.S | 2
arch/powerpc/include/asm/systbl.h | 2
arch/s390/kernel/compat_wrapper.S | 2
arch/sparc/kernel/smp_64.c | 4
arch/sparc/kernel/systbls_64.S | 2
arch/sparc/kernel/time_64.c | 4
arch/um/drivers/net_kern.c | 39
arch/um/include/shared/net_kern.h | 2
arch/x86/ia32/ia32entry.S | 2
arch/x86/ia32/sys_ia32.c | 22
arch/x86/include/asm/ia32.h | 7
arch/x86/include/asm/sys_ia32.h | 2
drivers/char/agp/intel-agp.c | 21
drivers/firewire/fw-card.c | 149 +
drivers/firewire/fw-cdev.c | 1044 ++++++--
drivers/firewire/fw-device.c | 203 +-
drivers/firewire/fw-device.h | 23
drivers/firewire/fw-iso.c | 227 ++
drivers/firewire/fw-ohci.c | 260 +-
drivers/firewire/fw-sbp2.c | 57
drivers/firewire/fw-topology.c | 29
drivers/firewire/fw-topology.h | 19
drivers/firewire/fw-transaction.c | 185 +
drivers/firewire/fw-transaction.h | 138 -
drivers/gpu/drm/Makefile | 3
drivers/gpu/drm/drm_debugfs.c | 235 ++
drivers/gpu/drm/drm_drv.c | 12
drivers/gpu/drm/drm_info.c | 328 +++
drivers/gpu/drm/drm_proc.c | 721 +-----
drivers/gpu/drm/drm_stub.c | 15
drivers/gpu/drm/i915/Makefile | 2
drivers/gpu/drm/i915/i915_dma.c | 116 +
drivers/gpu/drm/i915/i915_drv.c | 6
drivers/gpu/drm/i915/i915_drv.h | 21
drivers/gpu/drm/i915/i915_gem.c | 898 ++++++-
drivers/gpu/drm/i915/i915_gem_debugfs.c | 257 ++
drivers/gpu/drm/i915/i915_gem_proc.c | 334 ---
drivers/gpu/drm/i915/i915_gem_tiling.c | 31
drivers/gpu/drm/i915/i915_reg.h | 22
drivers/gpu/drm/i915/intel_bios.h | 12
drivers/gpu/drm/i915/intel_crt.c | 66 -
drivers/gpu/drm/i915/intel_display.c | 406 +++
drivers/gpu/drm/i915/intel_lvds.c | 2
drivers/gpu/drm/i915/intel_tv.c | 148 +
drivers/ieee1394/csr.c | 8
drivers/ieee1394/dv1394.c | 2
drivers/ieee1394/eth1394.c | 4
drivers/ieee1394/highlevel.c | 2
drivers/ieee1394/nodemgr.c | 4
drivers/ieee1394/nodemgr.h | 2
drivers/ieee1394/raw1394.c | 14
drivers/ieee1394/sbp2.c | 9
drivers/ieee1394/video1394.c | 2
drivers/infiniband/hw/nes/nes_nic.c | 2
drivers/media/dvb/firewire/firedtv-avc.c | 10
drivers/mtd/mtdsuper.c | 7
drivers/net/3c503.c | 3
drivers/net/Kconfig | 8
drivers/net/Makefile | 1
drivers/net/ac3200.c | 22
drivers/net/appletalk/cops.c | 45
drivers/net/appletalk/ltpc.c | 38
drivers/net/at1700.c | 19
drivers/net/benet/be_main.c | 28
drivers/net/cs89x0.c | 28
drivers/net/cxgb3/adapter.h | 4
drivers/net/cxgb3/common.h | 4
drivers/net/cxgb3/cxgb3_main.c | 12
drivers/net/cxgb3/sge.c | 164 +
drivers/net/cxgb3/t3_hw.c | 80 -
drivers/net/depca.c | 19
drivers/net/eepro.c | 17
drivers/net/eexpress.c | 17
drivers/net/eth16i.c | 18
drivers/net/ethoc.c | 1112 ++++++++
drivers/net/ewrk3.c | 19
drivers/net/gianfar.c | 48
drivers/net/ibmlana.c | 17
drivers/net/irda/donauboe.c | 12
drivers/net/lance.c | 19
drivers/net/lp486e.c | 17
drivers/net/ni52.c | 21
drivers/net/ni65.c | 75 -
drivers/net/seeq8005.c | 17
drivers/net/smc-ultra.c | 5
drivers/net/smc-ultra32.c | 23
drivers/net/smc9194.c | 17
drivers/net/smsc911x.c | 5
drivers/net/tokenring/madgemc.c | 11
drivers/net/tokenring/proteon.c | 9
drivers/net/tokenring/skisa.c | 9
drivers/net/tokenring/smctr.c | 16
drivers/net/ucc_geth.c | 21
drivers/net/wan/sdla.c | 36
drivers/net/wireless/Kconfig | 1
drivers/net/wireless/Makefile | 1
drivers/net/wireless/ar9170/Kconfig | 17
drivers/net/wireless/ar9170/Makefile | 3
drivers/net/wireless/ar9170/ar9170.h | 209 ++
drivers/net/wireless/ar9170/cmd.c | 129 +
drivers/net/wireless/ar9170/cmd.h | 91 +
drivers/net/wireless/ar9170/eeprom.h | 179 +
drivers/net/wireless/ar9170/hw.h | 417 +++
drivers/net/wireless/ar9170/led.c | 171 +
drivers/net/wireless/ar9170/mac.c | 452 +++
drivers/net/wireless/ar9170/main.c | 1671 +++++++++++++
drivers/net/wireless/ar9170/phy.c | 1240 +++++++++
drivers/net/wireless/ar9170/usb.c | 748 ++++++
drivers/net/wireless/ar9170/usb.h | 74 +
drivers/net/wireless/arlan-main.c | 21
drivers/net/wireless/ath5k/ath5k.h | 35
drivers/net/wireless/ath5k/attach.c | 2
drivers/net/wireless/ath5k/base.c | 46
drivers/net/wireless/ath5k/base.h | 2
drivers/net/wireless/ath5k/desc.c | 4
drivers/net/wireless/ath5k/eeprom.c | 774 ++++--
drivers/net/wireless/ath5k/eeprom.h | 128 +
drivers/net/wireless/ath5k/initvals.c | 4
drivers/net/wireless/ath5k/led.c | 2
drivers/net/wireless/ath5k/phy.c | 1170 ++++++++-
drivers/net/wireless/ath5k/reg.h | 19
drivers/net/wireless/ath5k/reset.c | 35
drivers/net/wireless/ath9k/ahb.c | 2
drivers/net/wireless/ath9k/ani.c | 2
drivers/net/wireless/ath9k/ani.h | 2
drivers/net/wireless/ath9k/ath9k.h | 9
drivers/net/wireless/ath9k/beacon.c | 56
drivers/net/wireless/ath9k/calib.c | 2
drivers/net/wireless/ath9k/calib.h | 2
drivers/net/wireless/ath9k/debug.c | 2
drivers/net/wireless/ath9k/debug.h | 2
drivers/net/wireless/ath9k/eeprom.c | 308 +-
drivers/net/wireless/ath9k/eeprom.h | 5
drivers/net/wireless/ath9k/hw.c | 14
drivers/net/wireless/ath9k/hw.h | 2
drivers/net/wireless/ath9k/initvals.h | 2
drivers/net/wireless/ath9k/mac.c | 2
drivers/net/wireless/ath9k/mac.h | 2
drivers/net/wireless/ath9k/main.c | 47
drivers/net/wireless/ath9k/pci.c | 20
drivers/net/wireless/ath9k/phy.c | 2
drivers/net/wireless/ath9k/phy.h | 2
drivers/net/wireless/ath9k/rc.c | 23
drivers/net/wireless/ath9k/rc.h | 2
drivers/net/wireless/ath9k/recv.c | 9
drivers/net/wireless/ath9k/reg.h | 2
drivers/net/wireless/ath9k/regd.c | 2
drivers/net/wireless/ath9k/regd.h | 2
drivers/net/wireless/ath9k/regd_common.h | 2
drivers/net/wireless/ath9k/xmit.c | 78 -
drivers/net/wireless/b43/main.c | 2
drivers/net/wireless/b43/xmit.c | 2
drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 2
drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 13
drivers/net/wireless/iwlwifi/iwl-3945.c | 24
drivers/net/wireless/iwlwifi/iwl-4965.c | 7
drivers/net/wireless/iwlwifi/iwl-5000.c | 9
drivers/net/wireless/iwlwifi/iwl-agn.c | 179 +
drivers/net/wireless/iwlwifi/iwl-core.c | 8
drivers/net/wireless/iwlwifi/iwl-core.h | 1
drivers/net/wireless/iwlwifi/iwl-debugfs.c | 54
drivers/net/wireless/iwlwifi/iwl-dev.h | 6
drivers/net/wireless/iwlwifi/iwl-helpers.h | 52
drivers/net/wireless/iwlwifi/iwl-power.c | 2
drivers/net/wireless/iwlwifi/iwl-sta.c | 4
drivers/net/wireless/iwlwifi/iwl-tx.c | 18
drivers/net/wireless/iwlwifi/iwl3945-base.c | 38
drivers/net/wireless/libertas/radiotap.h | 10
drivers/net/wireless/libertas/rx.c | 12
drivers/net/wireless/mac80211_hwsim.c | 4
drivers/net/wireless/p54/Kconfig | 39
drivers/net/wireless/p54/p54common.c | 16
drivers/net/wireless/rt2x00/rt73usb.c | 2
drivers/net/wireless/wavelan.c | 79 -
drivers/net/wireless/wavelan.p.h | 9
drivers/ssb/Kconfig | 16
drivers/ssb/b43_pci_bridge.c | 1
fs/9p/v9fs_vfs.h | 4
fs/9p/vfs_dentry.c | 4
fs/9p/vfs_super.c | 5
fs/Kconfig | 56
fs/Makefile | 6
fs/adfs/adfs.h | 2
fs/adfs/dir.c | 2
fs/affs/affs.h | 3
fs/affs/amigaffs.c | 8
fs/affs/namei.c | 4
fs/afs/dir.c | 2
fs/anon_inodes.c | 2
fs/attr.c | 3
fs/autofs/root.c | 2
fs/autofs4/inode.c | 2
fs/autofs4/root.c | 4
fs/block_dev.c | 146 +
fs/buffer.c | 145 -
fs/cifs/cifsfs.c | 3
fs/cifs/cifsfs.h | 4
fs/cifs/dir.c | 4
fs/coda/dir.c | 2
fs/compat.c | 28
fs/configfs/dir.c | 2
fs/dcache.c | 48
fs/devpts/inode.c | 188 -
fs/dlm/dir.c | 18
fs/dlm/dlm_internal.h | 2
fs/dlm/lock.c | 60
fs/dlm/lockspace.c | 2
fs/dlm/lowcomms.c | 181 +
fs/dlm/user.c | 24
fs/dquot.c | 2407 ------------------
fs/drop_caches.c | 2
fs/ecryptfs/dentry.c | 2
fs/ecryptfs/ecryptfs_kernel.h | 2
fs/ext2/balloc.c | 8
fs/ext2/ialloc.c | 10
fs/ext2/inode.c | 2
fs/ext2/super.c | 1
fs/ext2/xattr.c | 8
fs/ext3/balloc.c | 8
fs/ext3/ialloc.c | 12
fs/ext3/inode.c | 6
fs/ext3/namei.c | 6
fs/ext3/super.c | 48
fs/ext3/xattr.c | 6
fs/ext4/balloc.c | 2
fs/ext4/ext4.h | 2
fs/ext4/ialloc.c | 12
fs/ext4/inode.c | 40
fs/ext4/mballoc.c | 46
fs/ext4/namei.c | 6
fs/ext4/super.c | 54
fs/ext4/xattr.c | 6
fs/fat/namei_msdos.c | 2
fs/fat/namei_vfat.c | 4
fs/fuse/dir.c | 2
fs/fuse/fuse_i.h | 2
fs/gfs2/ops_dentry.c | 2
fs/gfs2/super.h | 2
fs/hfs/hfs_fs.h | 2
fs/hfs/sysdep.c | 2
fs/hfsplus/hfsplus_fs.h | 2
fs/hfsplus/inode.c | 2
fs/hostfs/hostfs_kern.c | 4
fs/hpfs/dentry.c | 2
fs/inode.c | 6
fs/isofs/inode.c | 2
fs/jfs/acl.c | 2
fs/jfs/inode.c | 6
fs/jfs/jfs_dtree.c | 18
fs/jfs/jfs_extent.c | 10
fs/jfs/jfs_inode.c | 4
fs/jfs/jfs_inode.h | 2
fs/jfs/jfs_xtree.c | 14
fs/jfs/namei.c | 10
fs/jfs/xattr.c | 12
fs/libfs.c | 5
fs/namei.c | 48
fs/namespace.c | 3
fs/ncpfs/dir.c | 4
fs/nfs/dir.c | 4
fs/nfs/nfs4_fs.h | 2
fs/nfsd/vfs.c | 4
fs/notify/inotify/inotify.c | 16
fs/ocfs2/dcache.c | 2
fs/ocfs2/dcache.h | 2
fs/open.c | 2
fs/pipe.c | 7
fs/proc/base.c | 6
fs/proc/generic.c | 2
fs/proc/proc_sysctl.c | 4
fs/proc/root.c | 3
fs/quota.c | 513 ----
fs/quota/Kconfig | 59
fs/quota/Makefile | 14
fs/quota/dquot.c | 2617 ++++++++++++++++++++
fs/quota/quota.c | 524 ++++
fs/quota/quota_tree.c | 651 +++++
fs/quota/quota_tree.h | 25
fs/quota/quota_v1.c | 234 ++
fs/quota/quota_v2.c | 237 ++
fs/quota/quotaio_v1.h | 33
fs/quota/quotaio_v2.h | 60
fs/quota_tree.c | 645 -----
fs/quota_tree.h | 25
fs/quota_v1.c | 218 --
fs/quota_v2.c | 236 --
fs/quotaio_v1.h | 33
fs/quotaio_v2.h | 60
fs/ramfs/file-nommu.c | 6
fs/reiserfs/bitmap.c | 14
fs/reiserfs/inode.c | 10
fs/reiserfs/namei.c | 6
fs/reiserfs/stree.c | 14
fs/reiserfs/super.c | 60
fs/reiserfs/xattr.c | 2
fs/smbfs/dir.c | 4
fs/super.c | 17
fs/sync.c | 2
fs/sysfs/dir.c | 2
fs/sysv/namei.c | 2
fs/sysv/sysv.h | 2
fs/ubifs/super.c | 3
fs/udf/balloc.c | 14
fs/udf/ialloc.c | 8
fs/ufs/balloc.c | 12
fs/ufs/ialloc.c | 8
fs/ufs/inode.c | 39
fs/ufs/namei.c | 2
fs/ufs/super.c | 11
fs/ufs/ufs.h | 2
include/drm/drmP.h | 77 +
include/drm/drm_pciids.h | 2
include/linux/buffer_head.h | 7
include/linux/compat.h | 8
include/linux/dcache.h | 2
include/linux/firewire-cdev.h | 218 +-
include/linux/fs.h | 220 +-
include/linux/ieee80211.h | 17
include/linux/if_frad.h | 1
include/linux/ncp_fs.h | 2
include/linux/netdevice.h | 1
include/linux/netfilter/x_tables.h | 23
include/linux/nfs_fs.h | 2
include/linux/nfs_xdr.h | 2
include/linux/nl80211.h | 88 +
include/linux/pci_ids.h | 2
include/linux/quota.h | 11
include/linux/quotaops.h | 119 +
include/net/cfg80211.h | 203 +-
include/net/ethoc.h | 22
include/net/ieee80211_radiotap.h | 4
include/net/mac80211.h | 84 -
include/net/netfilter/nf_conntrack.h | 14
include/net/netfilter/nf_conntrack_helper.h | 2
include/net/netfilter/nf_conntrack_l3proto.h | 7
include/net/netfilter/nf_conntrack_l4proto.h | 7
include/net/netfilter/nf_conntrack_tuple.h | 6
include/net/netlink.h | 1
include/net/netns/conntrack.h | 5
kernel/cgroup.c | 5
lib/nlattr.c | 27
net/appletalk/ddp.c | 6
net/ax25/af_ax25.c | 12
net/core/dev.c | 9
net/ipv4/netfilter/arp_tables.c | 18
net/ipv4/netfilter/ip_tables.c | 27
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 6
.../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 63
net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 6
net/ipv4/netfilter/nf_nat_core.c | 2
net/ipv6/ip6_input.c | 4
net/ipv6/netfilter/ip6_tables.c | 27
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 6
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 6
net/mac80211/agg-rx.c | 8
net/mac80211/agg-tx.c | 232 +-
net/mac80211/cfg.c | 245 +-
net/mac80211/debugfs.c | 24
net/mac80211/ibss.c | 3
net/mac80211/ieee80211_i.h | 78 -
net/mac80211/iface.c | 14
net/mac80211/main.c | 25
net/mac80211/mlme.c | 259 +-
net/mac80211/pm.c | 78 +
net/mac80211/rate.c | 6
net/mac80211/rate.h | 4
net/mac80211/rx.c | 29
net/mac80211/scan.c | 77 +
net/mac80211/sta_info.c | 17
net/mac80211/sta_info.h | 7
net/mac80211/tx.c | 579 +++-
net/mac80211/util.c | 126 -
net/mac80211/wep.c | 21
net/mac80211/wext.c | 33
net/mac80211/wpa.c | 28
net/netfilter/Kconfig | 2
net/netfilter/nf_conntrack_core.c | 129 +
net/netfilter/nf_conntrack_expect.c | 2
net/netfilter/nf_conntrack_helper.c | 8
net/netfilter/nf_conntrack_netlink.c | 94 +
net/netfilter/nf_conntrack_proto.c | 16
net/netfilter/nf_conntrack_proto_dccp.c | 9
net/netfilter/nf_conntrack_proto_gre.c | 1
net/netfilter/nf_conntrack_proto_sctp.c | 10
net/netfilter/nf_conntrack_proto_tcp.c | 15
net/netfilter/nf_conntrack_proto_udp.c | 2
net/netfilter/nf_conntrack_proto_udplite.c | 1
net/netfilter/nf_conntrack_standalone.c | 57
net/netfilter/xt_connlimit.c | 6
net/netfilter/xt_physdev.c | 21
net/netrom/af_netrom.c | 17
net/rose/af_rose.c | 4
net/socket.c | 2
net/sunrpc/rpc_pipe.c | 2
net/wireless/Kconfig | 50
net/wireless/Makefile | 3
net/wireless/core.c | 30
net/wireless/core.h | 5
net/wireless/mlme.c | 46
net/wireless/nl80211.c | 824 +++++-
net/wireless/nl80211.h | 38
net/wireless/reg.c | 65
net/wireless/scan.c | 27
net/wireless/wext-compat.c | 11
net/x25/af_x25.c | 6
net/xfrm/xfrm_state.c | 2
416 files changed, 21985 insertions(+), 10249 deletions(-)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic