tree ae2a2770143069fcde525839a8dd6076b1874569
parent 847bb224fb1cc8747e58959721b7bccd9b118047
parent f95d76ab82c381ce2221fbe75f331ff1478732db
author Linus Torvalds <torvalds@linux-foundation.org> 1282584964 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1282584964 -0700

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