Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
commit08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6
authorDavid S. Miller <davem@davemloft.net>
Thu, 26 Mar 2009 22:23:24 +0000 (26 15:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 26 Mar 2009 22:23:24 +0000 (26 15:23 -0700)
tree2be39bf8942edca1bcec735145e144a682ca9cd3
parentf0de70f8bb56952f6e016a65a8a8d006918f5bf6
parent0384e2959127a56d0640505d004d8dd92f9c29f5
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
drivers/net/wimax/i2400m/usb-notif.c
Documentation/feature-removal-schedule.txt
MAINTAINERS
arch/arm/mach-orion5x/common.c
arch/m68knommu/platform/528x/config.c
include/linux/pci_ids.h
lib/kobject_uevent.c
net/Kconfig
net/netfilter/nf_conntrack_pptp.c
net/sunrpc/xprtsock.c