Brian Behlendorf
|
b5c44e7a30
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-08 16:45:26 -08:00 |
|
Brian Behlendorf
|
eb4c9bf039
|
Update makefiles, kernel.c moved to libzpool
|
2008-12-08 16:41:14 -08:00 |
|
Brian Behlendorf
|
2f40ac4d9e
|
Minor tweak to update script
|
2008-12-08 16:38:46 -08:00 |
|
Brian Behlendorf
|
2afc42f6f9
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:28:49 -08:00 |
|
Brian Behlendorf
|
16965f00c0
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-08 16:28:47 -08:00 |
|
Brian Behlendorf
|
fd749472f0
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:28:39 -08:00 |
|
Brian Behlendorf
|
fab3740e84
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-08 16:28:36 -08:00 |
|
Brian Behlendorf
|
3a3004e896
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:28:29 -08:00 |
|
Brian Behlendorf
|
fe243a58b4
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-08 16:28:26 -08:00 |
|
Brian Behlendorf
|
f4ad0678a0
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:28:18 -08:00 |
|
Brian Behlendorf
|
ceb91de820
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-08 16:28:15 -08:00 |
|
Brian Behlendorf
|
a20b6d681d
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:28:08 -08:00 |
|
Brian Behlendorf
|
968d8c3293
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-08 16:28:05 -08:00 |
|
Brian Behlendorf
|
b2743e116c
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:27:58 -08:00 |
|
Brian Behlendorf
|
5f4eb3608a
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-08 16:27:55 -08:00 |
|
Brian Behlendorf
|
ab1bd017ba
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:27:49 -08:00 |
|
Brian Behlendorf
|
765a9d43eb
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-08 16:27:46 -08:00 |
|
Brian Behlendorf
|
6428868f57
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:27:39 -08:00 |
|
Brian Behlendorf
|
c7b376d4cf
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-08 16:27:36 -08:00 |
|
Brian Behlendorf
|
5befad1669
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:27:28 -08:00 |
|
Brian Behlendorf
|
965566f22e
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-08 16:27:26 -08:00 |
|
Brian Behlendorf
|
f0c51c8934
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:27:18 -08:00 |
|
Brian Behlendorf
|
6ae5501f64
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-08 16:27:16 -08:00 |
|
Brian Behlendorf
|
081131a413
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:27:08 -08:00 |
|
Brian Behlendorf
|
0d82a7ded4
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-08 16:27:06 -08:00 |
|
Brian Behlendorf
|
348155bcb6
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-08 16:27:04 -08:00 |
|
Brian Behlendorf
|
a784d5c7f1
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:26:53 -08:00 |
|
Brian Behlendorf
|
a84bf266ac
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-08 16:26:50 -08:00 |
|
Brian Behlendorf
|
200e65a591
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-08 16:26:49 -08:00 |
|
Brian Behlendorf
|
d2135f7b7b
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:26:35 -08:00 |
|
Brian Behlendorf
|
35055f5f72
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-08 16:26:34 -08:00 |
|
Brian Behlendorf
|
91767ced57
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:26:27 -08:00 |
|
Brian Behlendorf
|
3da44bac9a
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-08 16:26:25 -08:00 |
|
Brian Behlendorf
|
728573f9e9
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:26:18 -08:00 |
|
Brian Behlendorf
|
03a025c6e6
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-08 16:26:15 -08:00 |
|
Brian Behlendorf
|
7c357dc144
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:26:08 -08:00 |
|
Brian Behlendorf
|
befd9fa10a
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-08 16:26:06 -08:00 |
|
Brian Behlendorf
|
c102b81692
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:25:58 -08:00 |
|
Brian Behlendorf
|
f3dc5895ea
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-08 16:25:56 -08:00 |
|
Brian Behlendorf
|
11bcbbc4c2
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:25:49 -08:00 |
|
Brian Behlendorf
|
e273a8caa3
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-08 16:25:46 -08:00 |
|
Brian Behlendorf
|
ecc7db2f26
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:25:41 -08:00 |
|
Brian Behlendorf
|
69ac154a8d
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-08 16:25:38 -08:00 |
|
Brian Behlendorf
|
4caa960910
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-08 16:25:36 -08:00 |
|
Brian Behlendorf
|
a886a87c93
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2008-12-08 16:25:35 -08:00 |
|
Brian Behlendorf
|
d1f6052365
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2008-12-08 16:25:33 -08:00 |
|
Brian Behlendorf
|
e4b31def58
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2008-12-08 16:25:32 -08:00 |
|
Brian Behlendorf
|
de1f5737eb
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2008-12-08 16:25:32 -08:00 |
|
Brian Behlendorf
|
d114b094ad
|
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
|
2008-12-08 16:25:30 -08:00 |
|
Brian Behlendorf
|
c3cd0a9715
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2008-12-08 16:25:29 -08:00 |