]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b99e69 3fa8749)
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Fri, 10 Oct 2008 08:20:57 +0000 (11:20 +0300)
committerTony Lindgren <tony@atomide.com>
Fri, 10 Oct 2008 08:20:57 +0000 (11:20 +0300)
Merge branches 'master' and 'linus'

1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.