Brian Behlendorf
|
7f94f2a58e
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:17:27 -08:00 |
|
Brian Behlendorf
|
76fbe573f5
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-17 11:17:26 -08:00 |
|
Brian Behlendorf
|
9b17cd6a65
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:17:22 -08:00 |
|
Brian Behlendorf
|
482758ca0f
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-17 11:17:21 -08:00 |
|
Brian Behlendorf
|
746c17afcf
|
Resolve conflict
|
2008-12-17 11:16:41 -08:00 |
|
Brian Behlendorf
|
35c17babae
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-17 11:14:01 -08:00 |
|
Brian Behlendorf
|
7973e77bfc
|
Re-add zpool (part of it), we need to build it for the common bits
|
2008-12-17 11:12:06 -08:00 |
|
Brian Behlendorf
|
1ef609d29e
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:45:00 -08:00 |
|
Brian Behlendorf
|
4291b2e02f
|
Add locale.h
|
2008-12-17 10:43:06 -08:00 |
|
Brian Behlendorf
|
c7afbf0eba
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:21:48 -08:00 |
|
Brian Behlendorf
|
6bc98211b0
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-17 10:21:47 -08:00 |
|
Brian Behlendorf
|
28347c37b2
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:21:43 -08:00 |
|
Brian Behlendorf
|
b55821b54b
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-17 10:21:42 -08:00 |
|
Brian Behlendorf
|
5819203ee1
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:21:39 -08:00 |
|
Brian Behlendorf
|
57a4d68afb
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-17 10:21:38 -08:00 |
|
Brian Behlendorf
|
11df6505ef
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:21:34 -08:00 |
|
Brian Behlendorf
|
dd44909120
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 10:21:33 -08:00 |
|
Brian Behlendorf
|
4256c09232
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:21:30 -08:00 |
|
Brian Behlendorf
|
9d9d24f270
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-17 10:21:29 -08:00 |
|
Brian Behlendorf
|
c96d5b540d
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:21:26 -08:00 |
|
Brian Behlendorf
|
e2dd16f401
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-17 10:21:24 -08:00 |
|
Brian Behlendorf
|
a528824877
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:21:21 -08:00 |
|
Brian Behlendorf
|
7c41e396d1
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-17 10:21:20 -08:00 |
|
Brian Behlendorf
|
5fc8b40575
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:21:17 -08:00 |
|
Brian Behlendorf
|
cab207b673
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-17 10:21:15 -08:00 |
|
Brian Behlendorf
|
b92fa44e69
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:21:12 -08:00 |
|
Brian Behlendorf
|
cf5e58fdf3
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 10:21:11 -08:00 |
|
Brian Behlendorf
|
12422d5ea6
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:21:08 -08:00 |
|
Brian Behlendorf
|
70f8796775
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 10:21:06 -08:00 |
|
Brian Behlendorf
|
0b422cb11c
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:21:03 -08:00 |
|
Brian Behlendorf
|
40f9c5020a
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 10:21:02 -08:00 |
|
Brian Behlendorf
|
fb9664b20f
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:20:59 -08:00 |
|
Brian Behlendorf
|
74b4ee4211
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 10:20:58 -08:00 |
|
Brian Behlendorf
|
09b0ae1b6a
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-17 10:20:57 -08:00 |
|
Brian Behlendorf
|
41c962bba7
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:20:52 -08:00 |
|
Brian Behlendorf
|
8041950644
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-17 10:20:51 -08:00 |
|
Brian Behlendorf
|
47fc5596c4
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 10:20:50 -08:00 |
|
Brian Behlendorf
|
f6dff1c750
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:20:44 -08:00 |
|
Brian Behlendorf
|
3423e9517c
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-17 10:20:43 -08:00 |
|
Brian Behlendorf
|
9ccbf60203
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:20:40 -08:00 |
|
Brian Behlendorf
|
5914e6920f
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-17 10:20:39 -08:00 |
|
Brian Behlendorf
|
cb34d0db87
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:20:36 -08:00 |
|
Brian Behlendorf
|
f3e90811c3
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 10:20:34 -08:00 |
|
Brian Behlendorf
|
0358c1daaa
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:20:31 -08:00 |
|
Brian Behlendorf
|
5e9be3d254
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-17 10:20:30 -08:00 |
|
Brian Behlendorf
|
b5df2ce09a
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:20:27 -08:00 |
|
Brian Behlendorf
|
c8990fc37f
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-17 10:20:25 -08:00 |
|
Brian Behlendorf
|
38b3f7081e
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:20:22 -08:00 |
|
Brian Behlendorf
|
c7dd574d82
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-17 10:20:21 -08:00 |
|
Brian Behlendorf
|
e8fa895f36
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:20:18 -08:00 |