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)
commitdc4c26bfedcdd2b52231864c130bee2388e0eae4
treeae2a2770143069fcde525839a8dd6076b1874569
parent847bb224fb1cc8747e58959721b7bccd9b118047
parentf95d76ab82c381ce2221fbe75f331ff1478732db
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