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)
commit5cfc17766685c79d1a348bce24af9c9dbc0d8d67
treefa45f52df9ef673ae04894c00d8753f2845cb94f
parentc9272c4f9fbe2087beb3392f526dc5b19efaa56b
parenta1bd021e56fff91cc9354ffb232fd9f0f577099c
Merge branch 'master' of git://git./linux/kernel/git/sam/sparc