projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 00b464d 1113a7e)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Fri, 3 Feb 2006 02:51:52 +0000 (21:51 -0500)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Fri, 3 Feb 2006 02:51:52 +0000 (21:51 -0500)

Trivial merge
John Crispins staging tree