pilppa.com Git - linux-2.6-omap-h63xx.git/commit

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits)
  [TG3]: Fix msi issue with kexec/kdump.
  [NET] XFRM: Fix whitespace errors.
  [NET] TIPC: Fix whitespace errors.
  [NET] SUNRPC: Fix whitespace errors.
  [NET] SCTP: Fix whitespace errors.
  [NET] RXRPC: Fix whitespace errors.
  [NET] ROSE: Fix whitespace errors.
  [NET] RFKILL: Fix whitespace errors.
  [NET] PACKET: Fix whitespace errors.
  [NET] NETROM: Fix whitespace errors.
  [NET] NETFILTER: Fix whitespace errors.
  [NET] IPV4: Fix whitespace errors.
  [NET] DCCP: Fix whitespace errors.
  [NET] CORE: Fix whitespace errors.
  [NET] BLUETOOTH: Fix whitespace errors.
  [NET] AX25: Fix whitespace errors.
  [PATCH] mac80211: remove rtnl locking in ieee80211_sta.c
  [PATCH] mac80211: fix GCC warning on 64bit platforms
  [GENETLINK]: Dynamic multicast groups.
  [NETLIKN]: Allow removing multicast groups.
  ...

author	Linus Torvalds <torvalds@woody.linux-foundation.org>
	Thu, 19 Jul 2007 17:23:21 +0000 (10:23 -0700)
committer	Linus Torvalds <torvalds@woody.linux-foundation.org>
	Thu, 19 Jul 2007 17:23:21 +0000 (10:23 -0700)
commit	ce8c2293be47999584908069e78bf6d94beadc53
tree	dfd6909e6866998d2103341b1e1af8c129d0cea8	tree \| snapshot
parent	41e9d344bf52c57ec16648d08618b61d3f1d4bdc	commit \| diff
parent	ee6a99b539a50b4e9398938a0a6d37f8bf911550	commit \| diff

net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_sta.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_standalone.c	diff1 \|	diff2 \|	blob \| history