Brian Behlendorf
|
e2d4e043ea
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:34:52 -08:00 |
|
Brian Behlendorf
|
85ddb2d6c0
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-11 16:34:51 -08:00 |
|
Brian Behlendorf
|
c0263a6272
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:34:44 -08:00 |
|
Brian Behlendorf
|
9f20c1541f
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-11 16:34:42 -08:00 |
|
Brian Behlendorf
|
b2587f201d
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:34:36 -08:00 |
|
Brian Behlendorf
|
028e88ac61
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-11 16:34:34 -08:00 |
|
Brian Behlendorf
|
0dd42aefee
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:34:27 -08:00 |
|
Brian Behlendorf
|
2ae6a4865f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-11 16:34:25 -08:00 |
|
Brian Behlendorf
|
7c61040e9a
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:34:17 -08:00 |
|
Brian Behlendorf
|
531ffc59df
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-11 16:34:15 -08:00 |
|
Brian Behlendorf
|
5332504adb
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-11 16:34:13 -08:00 |
|
Brian Behlendorf
|
82fecb3d88
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:34:01 -08:00 |
|
Brian Behlendorf
|
aacdcf8d61
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-11 16:34:00 -08:00 |
|
Brian Behlendorf
|
c95fabb9c7
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-11 16:33:58 -08:00 |
|
Brian Behlendorf
|
8d9de103d6
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:33:46 -08:00 |
|
Brian Behlendorf
|
fe1de9437c
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-11 16:33:44 -08:00 |
|
Brian Behlendorf
|
1e117be6b3
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:33:38 -08:00 |
|
Brian Behlendorf
|
d10da26535
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-11 16:33:36 -08:00 |
|
Brian Behlendorf
|
24485fb6e0
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:33:30 -08:00 |
|
Brian Behlendorf
|
5fd7f8a200
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-11 16:33:28 -08:00 |
|
Brian Behlendorf
|
1f1f0de51e
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:33:22 -08:00 |
|
Brian Behlendorf
|
537c730876
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-11 16:33:20 -08:00 |
|
Brian Behlendorf
|
58c5a6c4c5
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:33:13 -08:00 |
|
Brian Behlendorf
|
576b61efb1
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-11 16:33:11 -08:00 |
|
Brian Behlendorf
|
1d1e473445
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-11 16:33:04 -08:00 |
|
Brian Behlendorf
|
af38bc9b0a
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-11 16:33:03 -08:00 |
|
Brian Behlendorf
|
a0914f2770
|
Refresh
|
2008-12-11 16:31:44 -08:00 |
|
Brian Behlendorf
|
8ca02fd72d
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-11 16:29:45 -08:00 |
|
Brian Behlendorf
|
a928ca95fc
|
Add to Makefile.am
|
2008-12-11 16:25:33 -08:00 |
|
Brian Behlendorf
|
9eb741a1fe
|
Readd missing header
|
2008-12-11 16:23:35 -08:00 |
|
Brian Behlendorf
|
1bd53d68b2
|
Refresh
|
2008-12-11 16:20:26 -08:00 |
|
Brian Behlendorf
|
e4fae8e3d4
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2008-12-11 15:41:52 -08:00 |
|
Brian Behlendorf
|
a0e625a878
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-11 15:41:52 -08:00 |
|
Brian Behlendorf
|
eefa9ab3ab
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2008-12-11 15:41:51 -08:00 |
|
Brian Behlendorf
|
2308a268a5
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2008-12-11 15:41:51 -08:00 |
|
Brian Behlendorf
|
12389cbaaf
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2008-12-11 15:41:51 -08:00 |
|
Brian Behlendorf
|
843ecec587
|
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
|
2008-12-11 15:41:50 -08:00 |
|
Brian Behlendorf
|
a557668285
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2008-12-11 15:41:49 -08:00 |
|
Brian Behlendorf
|
9e0b8ff76f
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-11 15:41:48 -08:00 |
|
Brian Behlendorf
|
182754d11a
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-11 15:41:48 -08:00 |
|
Brian Behlendorf
|
a442f70b33
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-11 15:41:47 -08:00 |
|
Brian Behlendorf
|
c41f16e355
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2008-12-11 15:41:47 -08:00 |
|
Brian Behlendorf
|
66b04c1abb
|
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
|
2008-12-11 15:41:46 -08:00 |
|
Brian Behlendorf
|
d35a0f25fe
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2008-12-11 15:41:45 -08:00 |
|
Brian Behlendorf
|
bb92f42dba
|
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
|
2008-12-11 15:41:45 -08:00 |
|
Brian Behlendorf
|
63d6795628
|
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
|
2008-12-11 15:41:43 -08:00 |
|
Brian Behlendorf
|
dd32efe6ef
|
Resolve conflict
|
2008-12-11 15:41:42 -08:00 |
|
Brian Behlendorf
|
8070a7f894
|
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
|
2008-12-11 15:41:30 -08:00 |
|
Brian Behlendorf
|
b8224d752e
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2008-12-11 15:41:29 -08:00 |
|
Brian Behlendorf
|
7e85cefdc5
|
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
|
2008-12-11 15:41:28 -08:00 |