tree a02e5ef1f2ae46c6328a6744e806c9e7dbff7327
parent 0151f94f2e61c39858e714a5d92244b0e5a7fdf5
parent df52092f3c97788592ef72501a43fb7ac6a3cfe0
author Linus Torvalds <torvalds@linux-foundation.org> 1238274033 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1238274033 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-for-30

* git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-for-30:
  fastboot: remove duplicate unpack_to_rootfs()
  ide/net: flip the order of SATA and network init
  async: remove the temporary (2.6.29) "async is off by default" code

Fix up conflicts in init/initramfs.c manually