Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
authorDavid S. Miller <davem@davemloft.net>
Sat, 12 Sep 2009 03:35:13 +0000 (20:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 12 Sep 2009 03:35:13 +0000 (20:35 -0700)
Conflicts:
arch/sparc/Kconfig


Trivial merge