Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Dec 2012 21:21:19 +0000 (13:21 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Dec 2012 21:21:19 +0000 (13:21 -0800)
commit8863e092410c766ca52da3e95eb9f707c7864fc2
tree19bd3a2c5449d8997ffbd28fbf87a425118c4332
parent8d9ea7172edd2e52da26b9485b4c97969a0d2648
parent476ab8fb78105f525cc56babb3980ffdd916aa24
Merge git://git./linux/kernel/git/davem/sparc-next

Pull tiny sparc update from David Miller:
 "Not much going on this release cycle in sparc land, just a Kconfig
  tweak."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next:
  of_i2c: sparc: Allow OF_I2C for sparc