Merge branch 'misc' of git://git.kernel.dk/linux-2.6-block

* 'misc' of git://git.kernel.dk/linux-2.6-block:
  ipheth: add support for iPhone 4
This commit is contained in:
Linus Torvalds 2010-08-23 10:36:04 -07:00
commit dc4c26bfed