653e0f02b0
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-03-13 11:00:56 -07:00
abfd24f708
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-13 11:00:47 -07:00
f4570a16ac
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-03-13 11:00:39 -07:00
faa835e9de
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-03-13 11:00:37 -07:00
fdc5439642
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-03-13 11:00:29 -07:00
335ce374d2
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-03-13 11:00:27 -07:00
dc7e11c142
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-03-13 11:00:18 -07:00
0c058d349e
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-03-13 11:00:14 -07:00
a7e44fdc75
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-03-13 11:00:06 -07:00
339553bdea
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-03-13 11:00:03 -07:00
f3e665bef8
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-03-13 10:59:55 -07:00
a4f8aecbe8
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-13 10:59:53 -07:00
5db7d213df
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-03-13 10:59:45 -07:00
ab636c01ec
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-13 10:59:42 -07:00
83443983a2
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-03-13 10:59:34 -07:00
344e59a582
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-13 10:59:32 -07:00
b60dd0bdd7
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-13 10:59:31 -07:00
198da4439c
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-13 10:59:17 -07:00
f21bd57c48
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-13 10:59:15 -07:00
adf984639d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-13 10:59:14 -07:00
dfd9be6dc4
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-03-13 10:59:00 -07:00
d93546b1d3
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-03-13 10:58:58 -07:00
5f50d10a32
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-03-13 10:58:50 -07:00
e815162f7c
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-03-13 10:58:45 -07:00
8b82591839
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-03-13 10:58:37 -07:00
ff514102dc
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-03-13 10:58:34 -07:00
3910e31f6e
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-03-13 10:58:27 -07:00
046a7b3333
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-03-13 10:58:24 -07:00
c1d2815ba4
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-03-13 10:58:16 -07:00
d3afa01aa9
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-13 10:58:14 -07:00
ac56fb7bd9
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-03-13 10:58:02 -07:00
fe2e7d8309
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-03-13 10:57:58 -07:00
d7f60ff869
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-13 10:57:50 -07:00
648bbdebbe
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-13 10:57:47 -07:00
486df2d11d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-13 10:57:46 -07:00
36c46c6031
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-13 10:57:45 -07:00
e7c7284c66
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-03-13 10:57:44 -07:00
d2910d2415
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-03-13 10:57:43 -07:00
c98996ded8
Explicitly cast to prevent 'void *' dereference.
2009-03-13 10:51:11 -07:00
adaf659f27
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-13 09:51:37 -07:00
caba3cb67e
Update specific asm-* arch to generic i386.
...
Depending on your x86 architecture $target_cpu can evaluate to
any of the following (i386|i486|i586|i686). Since our local asm
uses only i386 instructions sed is used to map all of these to
i386 and sets $target_arch. Other arch's are not impacted.
2009-03-13 09:41:55 -07:00
156794d723
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-03-13 09:24:29 -07:00
bae323dcc3
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-13 09:24:27 -07:00
ab5ed12292
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-03-13 09:24:18 -07:00
4e961693d2
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-13 09:24:14 -07:00
5be9f1f35b
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-03-13 09:24:03 -07:00
e58eb5c170
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-03-13 09:24:01 -07:00
728094f334
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-03-13 09:23:52 -07:00
fdcbe740a4
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-03-13 09:23:50 -07:00
b0364d9b43
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-03-13 09:23:38 -07:00
Brian Behlendorf