]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 18 Jul 2008 09:39:39 +0000 (02:39 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 Jul 2008 09:39:39 +0000 (02:39 -0700)
commit49997d75152b3d23c53b0fa730599f2f74c92c65
tree46e93126170d02cfec9505172e545732c1b69656
parenta0c80b80e0fb48129e4e9d6a9ede914f9ff1850d
parent5b664cb235e97afbf34db9c4d77f08ebd725335e
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-main.c
drivers/pci/pci-acpi.c
net/8021q/vlan.c
net/iucv/iucv.c
38 files changed:
Documentation/feature-removal-schedule.txt
Documentation/powerpc/booting-without-of.txt
MAINTAINERS
drivers/infiniband/ulp/ipoib/ipoib_multicast.c
drivers/net/Kconfig
drivers/net/Makefile
drivers/net/cxgb3/common.h
drivers/net/cxgb3/cxgb3_ctl_defs.h
drivers/net/cxgb3/cxgb3_offload.c
drivers/net/fs_enet/fs_enet-main.c
drivers/net/ibm_newemac/core.c
drivers/net/macb.c
drivers/net/macvlan.c
drivers/net/myri10ge/myri10ge.c
drivers/net/ppp_generic.c
drivers/net/tun.c
drivers/net/ucc_geth.c
drivers/net/wireless/atmel.c
drivers/net/wireless/libertas/if_cs.c
drivers/net/wireless/libertas/if_usb.c
drivers/net/wireless/rt2x00/rt2x00.h
drivers/net/wireless/rt2x00/rt2x00pci.h
drivers/net/wireless/rt2x00/rt61pci.c
drivers/net/wireless/rt2x00/rt73usb.c
drivers/net/wireless/zd1201.c
drivers/s390/net/qeth_l3_main.c
fs/compat_ioctl.c
include/linux/pci_ids.h
lib/textsearch.c
net/8021q/vlan.c
net/bridge/br_fdb.c
net/bridge/br_stp.c
net/core/dev.c
net/irda/irnet/irnet_ppp.c
net/iucv/af_iucv.c
net/iucv/iucv.c
net/netfilter/nf_conntrack_netlink.c
net/sunrpc/auth_gss/auth_gss.c