From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 Mar 2009 21:00:33 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-for-30
X-Git-Tag: v2.6.30-rc1~637
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eedf2c5296a8dfaaf9aec1a938c1d3bd73159a30;p=pandora-kernel.git

Merge git://git./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
---

eedf2c5296a8dfaaf9aec1a938c1d3bd73159a30
Reading git-diff-tree failed