]> err.no Git - linux-2.6/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/sparc
authorDavid S. Miller <davem@davemloft.net>
Mon, 28 Jul 2008 00:09:02 +0000 (17:09 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Jul 2008 00:09:02 +0000 (17:09 -0700)

Trivial merge