Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Mar 2011 00:47:38 +0000 (17:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Mar 2011 00:47:38 +0000 (17:47 -0700)
commit73939bb56acef1c9e776a10f0aeea0456d6815f6
tree89fbcd7fb613674587fcd5f2f0182aefe742e4cd
parent7c8d891c2c7714965db1685289787b0c526f9c42
parent1c833bc3b60744a385ac66cc1bc72fbecd5670ab
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc32: Fix multiple RTC detections on SUN4D