]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
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)
commit637704cbc95c02d18741b4a6e7a5d2397f8b28ce
treeaf99b09a5bc5c31a102df4b2fb4fe6cf10c518f4
parent4ae0a48b5efc44a95f5e7bb578f9de71fd35bfd0
parent0b255e927d47b550620dfd3475ee74b0f52e09c8
Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux

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