Merge branch 'misc' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 Aug 2010 17:36:04 +0000 (10:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 Aug 2010 17:36:04 +0000 (10:36 -0700)
* 'misc' of git://git.kernel.dk/linux-2.6-block:
  ipheth: add support for iPhone 4


Trivial merge