Brian Behlendorf
|
2286b6e77d
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-17 11:36:43 -08:00 |
|
Brian Behlendorf
|
b54d89a09a
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:36:40 -08:00 |
|
Brian Behlendorf
|
858f1f329a
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 11:36:39 -08:00 |
|
Brian Behlendorf
|
d7ad3994e7
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:36:36 -08:00 |
|
Brian Behlendorf
|
2098098cdb
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-17 11:36:35 -08:00 |
|
Brian Behlendorf
|
b82e987f0b
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:36:31 -08:00 |
|
Brian Behlendorf
|
5522071df6
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-17 11:36:30 -08:00 |
|
Brian Behlendorf
|
7d6da69062
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:36:27 -08:00 |
|
Brian Behlendorf
|
df43a2487a
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-17 11:36:26 -08:00 |
|
Brian Behlendorf
|
e0f0e02636
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:36:22 -08:00 |
|
Brian Behlendorf
|
2cb194bba6
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-17 11:36:21 -08:00 |
|
Brian Behlendorf
|
5ea99efac7
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 11:36:20 -08:00 |
|
Brian Behlendorf
|
676ab35598
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-17 11:36:19 -08:00 |
|
Brian Behlendorf
|
bad0d9a316
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2008-12-17 11:36:19 -08:00 |
|
Brian Behlendorf
|
0106dabb11
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-17 11:36:18 -08:00 |
|
Brian Behlendorf
|
a681d70e28
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 11:36:17 -08:00 |
|
Brian Behlendorf
|
5b9d98bf21
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-17 11:36:16 -08:00 |
|
Brian Behlendorf
|
e532f6bef4
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 11:36:16 -08:00 |
|
Brian Behlendorf
|
8af904a4b0
|
Resolve index shadowing /usr/include/string.h:304
|
2008-12-17 11:34:19 -08:00 |
|
Brian Behlendorf
|
ed9a35324d
|
Not sure why Sun needed to remove these externs, but I need them back
|
2008-12-17 11:32:47 -08:00 |
|
Brian Behlendorf
|
4a1ec47a19
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:28:52 -08:00 |
|
Brian Behlendorf
|
9e2f2bb378
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-17 11:28:51 -08:00 |
|
Brian Behlendorf
|
5a4f970b92
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:28:48 -08:00 |
|
Brian Behlendorf
|
d8a55bcb89
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-17 11:28:46 -08:00 |
|
Brian Behlendorf
|
36467daf52
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:28:43 -08:00 |
|
Brian Behlendorf
|
cdb3e8dffb
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-17 11:28:42 -08:00 |
|
Brian Behlendorf
|
f6c27d63b0
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:28:39 -08:00 |
|
Brian Behlendorf
|
100e5ebb03
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 11:28:37 -08:00 |
|
Brian Behlendorf
|
51764d4771
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:28:34 -08:00 |
|
Brian Behlendorf
|
4594f16eb4
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-17 11:28:33 -08:00 |
|
Brian Behlendorf
|
745ddac088
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:28:30 -08:00 |
|
Brian Behlendorf
|
84cf167e93
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-17 11:28:29 -08:00 |
|
Brian Behlendorf
|
db0417ce30
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:28:26 -08:00 |
|
Brian Behlendorf
|
511a49265a
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-17 11:28:24 -08:00 |
|
Brian Behlendorf
|
33b07313fc
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:28:21 -08:00 |
|
Brian Behlendorf
|
d07031a3a9
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-17 11:28:20 -08:00 |
|
Brian Behlendorf
|
5e55b9f4bc
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:28:17 -08:00 |
|
Brian Behlendorf
|
199eaf1874
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 11:28:16 -08:00 |
|
Brian Behlendorf
|
397ba3d401
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:28:12 -08:00 |
|
Brian Behlendorf
|
2ad946619e
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 11:28:11 -08:00 |
|
Brian Behlendorf
|
bbb9f388db
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:28:08 -08:00 |
|
Brian Behlendorf
|
44f4c483bc
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 11:28:07 -08:00 |
|
Brian Behlendorf
|
5b8195ad01
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:28:04 -08:00 |
|
Brian Behlendorf
|
45ae430ddb
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 11:28:03 -08:00 |
|
Brian Behlendorf
|
7927895d37
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-17 11:28:02 -08:00 |
|
Brian Behlendorf
|
6c9f801be6
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:27:57 -08:00 |
|
Brian Behlendorf
|
d4c990473f
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-17 11:27:55 -08:00 |
|
Brian Behlendorf
|
5cbfff3589
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 11:27:55 -08:00 |
|
Brian Behlendorf
|
818d313462
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:27:49 -08:00 |
|
Brian Behlendorf
|
18d71f8999
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-17 11:27:48 -08:00 |