Brian Behlendorf
|
706184dd17
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-08 10:12:57 -08:00 |
|
Brian Behlendorf
|
06757c0933
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:12:57 -08:00 |
|
Brian Behlendorf
|
8a2165ddcc
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:12:54 -08:00 |
|
Brian Behlendorf
|
63a8a5ca44
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-08 10:12:53 -08:00 |
|
Brian Behlendorf
|
cd4ec0a708
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:12:50 -08:00 |
|
Brian Behlendorf
|
3d81c63cbd
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-08 10:12:49 -08:00 |
|
Brian Behlendorf
|
221c82ffeb
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-08 10:12:46 -08:00 |
|
Brian Behlendorf
|
e626662a4e
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:12:46 -08:00 |
|
Brian Behlendorf
|
566ad1b808
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-08 10:12:42 -08:00 |
|
Brian Behlendorf
|
d529d4e450
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:12:42 -08:00 |
|
Brian Behlendorf
|
a4f5db62aa
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:12:39 -08:00 |
|
Brian Behlendorf
|
85009f4e59
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-08 10:12:38 -08:00 |
|
Brian Behlendorf
|
5dc0f37f61
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-08 10:12:35 -08:00 |
|
Brian Behlendorf
|
b11e5e30c4
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:12:35 -08:00 |
|
Brian Behlendorf
|
8a63bdf4eb
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-08 10:12:34 -08:00 |
|
Brian Behlendorf
|
e7109c4ea8
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:12:29 -08:00 |
|
Brian Behlendorf
|
1565b6f085
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-08 10:12:28 -08:00 |
|
Brian Behlendorf
|
748ee8452c
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-08 10:12:28 -08:00 |
|
Brian Behlendorf
|
93b7ec3c7a
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:12:23 -08:00 |
|
Brian Behlendorf
|
7881ea4624
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-08 10:12:22 -08:00 |
|
Brian Behlendorf
|
ea27414f3c
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:12:19 -08:00 |
|
Brian Behlendorf
|
1de3c95cf7
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-08 10:12:18 -08:00 |
|
Brian Behlendorf
|
38a601674f
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:12:15 -08:00 |
|
Brian Behlendorf
|
623e08dff2
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-08 10:12:14 -08:00 |
|
Brian Behlendorf
|
5080757452
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-08 10:12:11 -08:00 |
|
Brian Behlendorf
|
ef319de444
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:12:11 -08:00 |
|
Brian Behlendorf
|
ff9dc08932
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:12:08 -08:00 |
|
Brian Behlendorf
|
00ecc7d3e5
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-08 10:12:07 -08:00 |
|
Brian Behlendorf
|
f9625109ab
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:12:04 -08:00 |
|
Brian Behlendorf
|
387ef21ab6
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-08 10:12:03 -08:00 |
|
Brian Behlendorf
|
61e6f92381
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-08 10:12:00 -08:00 |
|
Brian Behlendorf
|
a15fc79767
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-08 10:11:59 -08:00 |
|
Brian Behlendorf
|
c6b3007cbe
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-08 10:11:59 -08:00 |
|
Brian Behlendorf
|
17c6f97565
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-08 10:11:58 -08:00 |
|
Brian Behlendorf
|
b5908e07c0
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-08 10:11:58 -08:00 |
|
Brian Behlendorf
|
7fc98fdcdf
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2008-12-08 10:11:57 -08:00 |
|
Brian Behlendorf
|
4537766d57
|
Initialize unused sepp to NULL
|
2008-12-08 10:10:03 -08:00 |
|
Brian Behlendorf
|
987a54604c
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-05 17:08:04 -08:00 |
|
Brian Behlendorf
|
a48cfb585d
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-05 17:07:10 -08:00 |
|
Brian Behlendorf
|
a3b2032628
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-05 17:07:08 -08:00 |
|
Brian Behlendorf
|
2f41d12833
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-05 17:07:02 -08:00 |
|
Brian Behlendorf
|
5a7516ab47
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-05 17:07:00 -08:00 |
|
Brian Behlendorf
|
d193dce188
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-05 17:06:55 -08:00 |
|
Brian Behlendorf
|
77c5bdaa54
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-05 17:06:54 -08:00 |
|
Brian Behlendorf
|
290205f377
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-05 17:06:49 -08:00 |
|
Brian Behlendorf
|
de39d6d02a
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-05 17:06:48 -08:00 |
|
Brian Behlendorf
|
823e65fd83
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-05 17:06:43 -08:00 |
|
Brian Behlendorf
|
f122d50bb7
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-05 17:06:42 -08:00 |
|
Brian Behlendorf
|
b541db2893
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-05 17:06:36 -08:00 |
|
Brian Behlendorf
|
289b25f78d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-05 17:06:34 -08:00 |