]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fcd195c 69a9cea)
Merge branch 'master' of git://git.infradead.org/users/dwmw2/solos-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 22 Sep 2009 22:18:59 +0000 (15:18 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 22 Sep 2009 22:18:59 +0000 (15:18 -0700)
1  2 
drivers/atm/solos-pci.c patch | diff1 | diff2 | blob | history

diff --cc drivers/atm/solos-pci.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.