]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Dec 2012 17:48:33 +0000 (09:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Dec 2012 17:48:33 +0000 (09:48 -0800)
Pull i2c __dev* attribute removal from Wolfram Sang:
 "The squashed patches from Bill to get rid of the __dev* annotations in
  the i2c subsystem.  I couldn't include it in my previous pull request
  due to some dependency with the mfd subsystem.  I had this patch in
  linux-next for two days before rc1 and nothing popped up."

* 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux:
  i2c: remove __dev* attributes from subsystem


Trivial merge