]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7f51904 12f24b7)
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)
commit3a1c2e9a5c06277cbb446b3ac47af7320acb03e2
treea02e5ef1f2ae46c6328a6744e806c9e7dbff7327tree | snapshot
parent7f5190409e6f4edc843ee1a30c82e65cf4d6679acommit | diff
parent12f24b7d26a635592275f914ef7bfa272f08a9fecommit | diff
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
init/initramfs.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.