Brian Behlendorf
|
79784bde35
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2008-12-09 13:38:33 -08:00 |
|
Brian Behlendorf
|
bde4b75732
|
Resolve conflict
|
2008-12-09 13:38:29 -08:00 |
|
Brian Behlendorf
|
d2b7b2c0de
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-09 13:34:12 -08:00 |
|
Brian Behlendorf
|
48343be6a3
|
Temporarily move taskq+util to libzpool until that directory is broken in to lib+module
|
2008-12-09 13:32:01 -08:00 |
|
Brian Behlendorf
|
14ee9a41e5
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-09 12:42:29 -08:00 |
|
Brian Behlendorf
|
69a1156686
|
Add missing u8 header
|
2008-12-09 12:38:02 -08:00 |
|
Brian Behlendorf
|
ac01276013
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:59:21 -08:00 |
|
Brian Behlendorf
|
a0452e7349
|
Remove lint dependency
|
2008-12-08 16:55:20 -08:00 |
|
Brian Behlendorf
|
becf509b07
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:50:04 -08:00 |
|
Brian Behlendorf
|
a7035dd8c9
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-08 16:50:01 -08:00 |
|
Brian Behlendorf
|
a0f903e604
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:49:53 -08:00 |
|
Brian Behlendorf
|
ee44b4a024
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-08 16:49:51 -08:00 |
|
Brian Behlendorf
|
b1ff2047b9
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:49:45 -08:00 |
|
Brian Behlendorf
|
20d9691996
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-08 16:49:43 -08:00 |
|
Brian Behlendorf
|
3a0209353d
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:49:34 -08:00 |
|
Brian Behlendorf
|
9315027434
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-08 16:49:32 -08:00 |
|
Brian Behlendorf
|
683855403e
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:49:23 -08:00 |
|
Brian Behlendorf
|
5808d2db72
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-08 16:49:21 -08:00 |
|
Brian Behlendorf
|
b7450308cd
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:49:15 -08:00 |
|
Brian Behlendorf
|
d0450ce62c
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-08 16:49:12 -08:00 |
|
Brian Behlendorf
|
0876a6d942
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:49:05 -08:00 |
|
Brian Behlendorf
|
4e626e24ce
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-08 16:49:02 -08:00 |
|
Brian Behlendorf
|
e749ed378c
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:48:56 -08:00 |
|
Brian Behlendorf
|
a196211462
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-08 16:48:55 -08:00 |
|
Brian Behlendorf
|
619876d02d
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:48:48 -08:00 |
|
Brian Behlendorf
|
e101424239
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-08 16:48:45 -08:00 |
|
Brian Behlendorf
|
d88b42d713
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:48:38 -08:00 |
|
Brian Behlendorf
|
bce207cae8
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-08 16:48:36 -08:00 |
|
Brian Behlendorf
|
24473b5441
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:48:29 -08:00 |
|
Brian Behlendorf
|
3ad29b96ee
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-08 16:48:28 -08:00 |
|
Brian Behlendorf
|
568d200a06
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-08 16:48:27 -08:00 |
|
Brian Behlendorf
|
7dd322f02c
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:48:17 -08:00 |
|
Brian Behlendorf
|
39093f5bb5
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-08 16:48:16 -08:00 |
|
Brian Behlendorf
|
78bc804fe0
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-08 16:48:14 -08:00 |
|
Brian Behlendorf
|
75f678c256
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:48:01 -08:00 |
|
Brian Behlendorf
|
5751784328
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-08 16:47:59 -08:00 |
|
Brian Behlendorf
|
80227c2659
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:47:54 -08:00 |
|
Brian Behlendorf
|
7b50390efd
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-08 16:47:52 -08:00 |
|
Brian Behlendorf
|
c58c45a9cf
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:47:47 -08:00 |
|
Brian Behlendorf
|
fb31a32a70
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-08 16:47:44 -08:00 |
|
Brian Behlendorf
|
2efe37d58d
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:47:37 -08:00 |
|
Brian Behlendorf
|
30cf74333a
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-08 16:47:34 -08:00 |
|
Brian Behlendorf
|
9d9005966c
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:47:26 -08:00 |
|
Brian Behlendorf
|
19b0553a19
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-08 16:47:23 -08:00 |
|
Brian Behlendorf
|
8f5899e2ee
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:47:15 -08:00 |
|
Brian Behlendorf
|
8dd429fca8
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-08 16:47:12 -08:00 |
|
Brian Behlendorf
|
c9e7ffd777
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-08 16:47:04 -08:00 |
|
Brian Behlendorf
|
d0bb7403c7
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-08 16:46:53 -08:00 |
|
Brian Behlendorf
|
acaaeda92a
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-08 16:46:51 -08:00 |
|
Brian Behlendorf
|
701affe4ca
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2008-12-08 16:46:48 -08:00 |