Brian Behlendorf
|
1ecb6657bf
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-09 13:34:11 -08:00 |
|
Brian Behlendorf
|
b881b78bc9
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-09 13:34:10 -08:00 |
|
Brian Behlendorf
|
2cdd344a5d
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-09 13:34:06 -08:00 |
|
Brian Behlendorf
|
980384b4bc
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-09 13:34:05 -08:00 |
|
Brian Behlendorf
|
718daa8fdf
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-09 13:34:02 -08:00 |
|
Brian Behlendorf
|
887409fdc4
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 13:34:01 -08:00 |
|
Brian Behlendorf
|
30163fb571
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-09 13:33:57 -08:00 |
|
Brian Behlendorf
|
6a2d852b35
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-09 13:33:56 -08:00 |
|
Brian Behlendorf
|
c7b309f9b1
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-09 13:33:55 -08:00 |
|
Brian Behlendorf
|
d3d2ff38e8
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 13:33:50 -08:00 |
|
Brian Behlendorf
|
8d12e9b274
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 13:33:48 -08:00 |
|
Brian Behlendorf
|
bc5e2d8660
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 13:33:48 -08:00 |
|
Brian Behlendorf
|
41bed89ee1
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-09 13:33:42 -08:00 |
|
Brian Behlendorf
|
4b3b709ae5
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-09 13:33:41 -08:00 |
|
Brian Behlendorf
|
b1224c4a36
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 13:33:37 -08:00 |
|
Brian Behlendorf
|
4c4548a35a
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-09 13:33:36 -08:00 |
|
Brian Behlendorf
|
9f45f6b301
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-09 13:33:32 -08:00 |
|
Brian Behlendorf
|
0cdd410c22
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-09 13:33:31 -08:00 |
|
Brian Behlendorf
|
98182a42b0
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-09 13:33:28 -08:00 |
|
Brian Behlendorf
|
45695d15ee
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-09 13:33:26 -08:00 |
|
Brian Behlendorf
|
8914f2ebc7
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-09 13:33:23 -08:00 |
|
Brian Behlendorf
|
f91ee39124
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-09 13:33:22 -08:00 |
|
Brian Behlendorf
|
f062428334
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-09 13:33:18 -08:00 |
|
Brian Behlendorf
|
7e232d50f2
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-09 13:33:17 -08:00 |
|
Brian Behlendorf
|
bf5a93e1ec
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-09 13:33:14 -08:00 |
|
Brian Behlendorf
|
7357c92d76
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-09 13:33:12 -08:00 |
|
Brian Behlendorf
|
7a7a074d3d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-09 13:33:11 -08:00 |
|
Brian Behlendorf
|
cd5e331e68
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-09 13:33:10 -08:00 |
|
Brian Behlendorf
|
fb79976d3c
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2009-01-09 13:33:10 -08:00 |
|
Brian Behlendorf
|
953d302b87
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2009-01-09 13:33:09 -08:00 |
|
Brian Behlendorf
|
04638ead67
|
Change zpool module name to zfs and update references
|
2009-01-09 13:31:16 -08:00 |
|
Brian Behlendorf
|
ca4fc6ef63
|
Fix cast
|
2009-01-09 13:29:41 -08:00 |
|
Brian Behlendorf
|
68585e71a8
|
Get correct exit prototype
|
2009-01-09 13:28:42 -08:00 |
|
Brian Behlendorf
|
7973279404
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-09 13:01:24 -08:00 |
|
Brian Behlendorf
|
a0e6b003d4
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-01-09 13:01:23 -08:00 |
|
Brian Behlendorf
|
711774c008
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 13:01:22 -08:00 |
|
Brian Behlendorf
|
f1549b9636
|
Take tsd_* functions out for now, we need it for the ZPL later
|
2009-01-09 12:53:37 -08:00 |
|
Brian Behlendorf
|
307c1ea71d
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2009-01-09 12:51:02 -08:00 |
|
Brian Behlendorf
|
04730311d8
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2009-01-09 12:50:55 -08:00 |
|
Brian Behlendorf
|
bb242a5dc8
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 12:50:50 -08:00 |
|
Brian Behlendorf
|
0ae94a5f86
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-09 12:50:45 -08:00 |
|
Brian Behlendorf
|
d8c982694a
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-09 12:50:37 -08:00 |
|
Brian Behlendorf
|
49bfc84b6c
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-09 12:50:33 -08:00 |
|
Brian Behlendorf
|
9cfd0a26d0
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 12:50:25 -08:00 |
|
Brian Behlendorf
|
e154e219b5
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-09 12:50:22 -08:00 |
|
Brian Behlendorf
|
0939594436
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-09 12:50:15 -08:00 |
|
Brian Behlendorf
|
b77b7a4741
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-09 12:50:10 -08:00 |
|
Brian Behlendorf
|
66a5203c13
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-09 12:50:01 -08:00 |
|
Brian Behlendorf
|
3a7eb61188
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-09 12:49:56 -08:00 |
|
Brian Behlendorf
|
b28b027c24
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-09 12:49:50 -08:00 |