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 |
|
Brian Behlendorf
|
de74548588
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-05 17:06:28 -08:00 |
|
Brian Behlendorf
|
d22a9080f5
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-05 17:06:26 -08:00 |
|
Brian Behlendorf
|
4b3a63c42e
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-05 17:06:20 -08:00 |
|
Brian Behlendorf
|
4232c01f48
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-05 17:06:19 -08:00 |
|
Brian Behlendorf
|
5da0467f1a
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-05 17:06:12 -08:00 |
|
Brian Behlendorf
|
ef1e763ab9
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-05 17:06:12 -08:00 |
|
Brian Behlendorf
|
e2e8bef511
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-05 17:06:07 -08:00 |
|
Brian Behlendorf
|
806412e3a1
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-05 17:06:06 -08:00 |
|
Brian Behlendorf
|
00204db27a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-05 17:06:05 -08:00 |
|
Brian Behlendorf
|
2bb315b696
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-05 17:05:58 -08:00 |
|
Brian Behlendorf
|
7377d031da
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-05 17:05:57 -08:00 |
|
Brian Behlendorf
|
b6fb02a6ec
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-05 17:05:56 -08:00 |
|
Brian Behlendorf
|
c6a36cd7aa
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-05 17:05:48 -08:00 |
|
Brian Behlendorf
|
16d0a75b5c
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-05 17:05:46 -08:00 |
|
Brian Behlendorf
|
1daff8f4fe
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-05 17:05:40 -08:00 |
|
Brian Behlendorf
|
6d8e2cc2ed
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-05 17:05:38 -08:00 |
|
Brian Behlendorf
|
402561b6fe
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-05 17:05:33 -08:00 |
|
Brian Behlendorf
|
b7ab342a1e
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-05 17:05:31 -08:00 |
|
Brian Behlendorf
|
b027a4a4a2
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-05 17:05:26 -08:00 |
|
Brian Behlendorf
|
5a8fd77bd1
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-05 17:05:24 -08:00 |
|
Brian Behlendorf
|
c2558ad3b2
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-05 17:05:18 -08:00 |
|
Brian Behlendorf
|
4b240ada01
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-05 17:05:17 -08:00 |
|
Brian Behlendorf
|
72149bb7c6
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-05 17:05:11 -08:00 |
|
Brian Behlendorf
|
d2da5c8b82
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-05 17:05:10 -08:00 |
|
Brian Behlendorf
|
8bcf9519ba
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-05 17:05:06 -08:00 |
|
Brian Behlendorf
|
b7cb15cd62
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-05 17:05:04 -08:00 |
|
Brian Behlendorf
|
b0887ddcd7
|
Add linux-libspl branch
|
2008-12-05 16:59:15 -08:00 |
|
Brian Behlendorf
|
5b29fa2d78
|
Disable unknown pragmas
|
2008-12-05 16:53:29 -08:00 |
|
Brian Behlendorf
|
eef812bea9
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-05 15:06:33 -08:00 |
|
Brian Behlendorf
|
0cf5e813cf
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-05 15:06:32 -08:00 |
|
Brian Behlendorf
|
c4a4da6108
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-05 15:06:29 -08:00 |
|
Brian Behlendorf
|
17420f0f40
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-05 15:06:28 -08:00 |
|
Brian Behlendorf
|
07b1fbe4f4
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-05 15:06:25 -08:00 |