Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 3 Apr 2008 21:33:42 +0000 (14:33 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 Apr 2008 21:33:42 +0000 (14:33 -0700)
commit3bb5da3837cc1aa17736b05139c9a22c3794851a
treec92d5684a866542b1cb20641607ac1643ce03a47
parent7feb49c82a74bc7c091b8ab2a3f96baa33d08ece
parent9597362d354f8655ece324b01d0c640a0e99c077
Merge branch 'master' of git://git./linux/kernel/git/davem/net-2.6
Documentation/feature-removal-schedule.txt
MAINTAINERS
lib/kobject_uevent.c
net/core/sock.c
net/rxrpc/ar-internal.h