From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 23 May 2007 15:16:24 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v3.12-rc1~29362
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4598c95514f9a50b49626e1e5d1f292180b643fa;p=kernel%2Fkernel-generic.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [RTNETLINK]: Remove remains of wireless extensions over rtnetlink
  [RTNETLINK]: Allow changing of subsets of netdevice flags in rtnl_setlink
  [AF_RXRPC]: Make call state names available if CONFIG_PROC_FS=n
  [AF_RXRPC]: AF_RXRPC depends on IPv4
  [IPSEC]: Fix warnings with casting int to pointer
---

4598c95514f9a50b49626e1e5d1f292180b643fa