projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0151f94 df52092)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-for-30
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Mar 2009 21:00:33 +0000 (14:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Mar 2009 21:00:33 +0000 (14:00 -0700)
commiteedf2c5296a8dfaaf9aec1a938c1d3bd73159a30
treea02e5ef1f2ae46c6328a6744e806c9e7dbff7327tree | snapshot
parent0151f94f2e61c39858e714a5d92244b0e5a7fdf5commit | diff
parentdf52092f3c97788592ef72501a43fb7ac6a3cfe0commit | diff
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
init/initramfs.c diff1 | diff2 | blob | history
John Crispins staging tree