www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit

]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit

projects / linux-2.6-omap-h63xx.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 794eb6b 4b119e2)

author	David S. Miller <davem@davemloft.net>
	Fri, 18 Apr 2008 06:56:30 +0000 (23:56 -0700)
committer	David S. Miller <davem@davemloft.net>
	Fri, 18 Apr 2008 06:56:30 +0000 (23:56 -0700)
commit	1e42198609d73ed1a9adcba2af275c24c2678420
tree	32fd4d9073bfc0f3909af8f9fb4bcff38951d01a	tree \| snapshot
parent	794eb6bf20ebf992c040ea831cd3a9c64b0c1f7a	commit \| diff
parent	4b119e21d0c66c22e8ca03df05d9de623d0eb50f	commit \| diff

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

17 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/fec_mpc52xx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fec_mpc52xx_phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ps3_gelic_wireless.c	diff1 \|	diff2 \|	blob \| history
drivers/net/smc91x.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/dma.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43legacy/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtl8187_dev.c	diff1 \|	diff2 \|	blob \| history
drivers/ssb/main.c	diff1 \|	diff2 \|	blob \| history
include/linux/ssb/ssb.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipconfig.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/rxrpc/ar-internal.h	diff1 \|	diff2 \|	blob \| history
net/sched/sch_api.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/clnt.c	diff1 \|	diff2 \|	blob \| history
security/selinux/ss/services.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.