]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a16893 4409d28)
Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc...
authorJeff Garzik <jeff@garzik.org>
Sat, 17 Feb 2007 20:09:59 +0000 (15:09 -0500)
committerJeff Garzik <jeff@garzik.org>
Sat, 17 Feb 2007 20:09:59 +0000 (15:09 -0500)
1  2 
net/core/net-sysfs.c patch | diff1 | diff2 | blob | history
net/ieee80211/ieee80211_tx.c patch | diff1 | diff2 | blob | history

diff --cc net/core/net-sysfs.c
Simple merge
diff --cc net/ieee80211/ieee80211_tx.c
Simple merge
Linux 2.6 source tree