Brian Behlendorf
|
94caad0d1f
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-03-11 13:27:22 -07:00 |
|
Brian Behlendorf
|
7d2626ec67
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-11 13:27:11 -07:00 |
|
Brian Behlendorf
|
46a021cc8b
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-03-11 13:27:09 -07:00 |
|
Brian Behlendorf
|
70838df0da
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-03-11 13:26:59 -07:00 |
|
Brian Behlendorf
|
59eb9ff22a
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-03-11 13:26:57 -07:00 |
|
Brian Behlendorf
|
a055582620
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-03-11 13:26:48 -07:00 |
|
Brian Behlendorf
|
e07539b8df
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-03-11 13:26:45 -07:00 |
|
Brian Behlendorf
|
88dc13ed99
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-03-11 13:26:35 -07:00 |
|
Brian Behlendorf
|
2a66030fab
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-03-11 13:26:33 -07:00 |
|
Brian Behlendorf
|
de411e7109
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-11 13:26:23 -07:00 |
|
Brian Behlendorf
|
0d1f924c2d
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-03-11 13:26:21 -07:00 |
|
Brian Behlendorf
|
a022f70c20
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-03-11 13:26:11 -07:00 |
|
Brian Behlendorf
|
8c02ea3a49
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-03-11 13:26:09 -07:00 |
|
Brian Behlendorf
|
9be48d4966
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-03-11 13:25:59 -07:00 |
|
Brian Behlendorf
|
2510eb0d8b
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-03-11 13:25:57 -07:00 |
|
Brian Behlendorf
|
7c932d60f0
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-03-11 13:25:47 -07:00 |
|
Brian Behlendorf
|
e5aea7e980
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-03-11 13:25:45 -07:00 |
|
Brian Behlendorf
|
6ffd92964e
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-03-11 13:25:44 -07:00 |
|
Brian Behlendorf
|
e04edf64c2
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-03-11 13:25:26 -07:00 |
|
Brian Behlendorf
|
02159c4359
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-03-11 13:25:24 -07:00 |
|
Brian Behlendorf
|
5915d545e9
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-03-11 13:25:23 -07:00 |
|
Brian Behlendorf
|
4fe5e2a2a6
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-03-11 13:25:04 -07:00 |
|
Brian Behlendorf
|
6a721fa85b
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-03-11 13:25:02 -07:00 |
|
Brian Behlendorf
|
b628433bbf
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-03-11 13:24:52 -07:00 |
|
Brian Behlendorf
|
74dfa9f5bd
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-03-11 13:24:50 -07:00 |
|
Brian Behlendorf
|
e62f7cc0ef
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-03-11 13:24:40 -07:00 |
|
Brian Behlendorf
|
ecf5731b50
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-03-11 13:24:37 -07:00 |
|
Brian Behlendorf
|
7c1264f36a
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-03-11 13:24:27 -07:00 |
|
Brian Behlendorf
|
324a2db761
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-03-11 13:24:25 -07:00 |
|
Brian Behlendorf
|
c3850d5bda
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-03-11 13:24:12 -07:00 |
|
Brian Behlendorf
|
7c9f03399c
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-03-11 13:24:10 -07:00 |
|
Brian Behlendorf
|
84f8c7db37
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-03-11 13:24:00 -07:00 |
|
Brian Behlendorf
|
0a1931c13f
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-03-11 13:23:58 -07:00 |
|
Brian Behlendorf
|
2369dcfc6e
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-03-11 13:23:48 -07:00 |
|
Brian Behlendorf
|
edce9778ba
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-03-11 13:23:46 -07:00 |
|
Brian Behlendorf
|
4e945fb768
|
Remove -Wno-unknown-pragmas compile option, all unknown pragmas
have been removed by the gcc-ident-pragmas topic branch.
|
2009-03-11 13:14:08 -07:00 |
|
Brian Behlendorf
|
523dccdb08
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:48:19 -07:00 |
|
Brian Behlendorf
|
d4057cc233
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-03-11 12:48:16 -07:00 |
|
Brian Behlendorf
|
384c23a1c7
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:48:06 -07:00 |
|
Brian Behlendorf
|
6869252da7
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-03-11 12:48:04 -07:00 |
|
Brian Behlendorf
|
7ae131eb27
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:47:54 -07:00 |
|
Brian Behlendorf
|
391e69efd8
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-03-11 12:47:51 -07:00 |
|
Brian Behlendorf
|
846d41cccb
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:47:40 -07:00 |
|
Brian Behlendorf
|
4033ffb9ee
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-03-11 12:47:38 -07:00 |
|
Brian Behlendorf
|
40b822690a
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:47:28 -07:00 |
|
Brian Behlendorf
|
b56b3ef9b9
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-03-11 12:47:26 -07:00 |
|
Brian Behlendorf
|
8fc23f2cf5
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:47:15 -07:00 |
|
Brian Behlendorf
|
03ffadb74b
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-03-11 12:47:12 -07:00 |
|
Brian Behlendorf
|
f5bb6475ab
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-03-11 12:47:01 -07:00 |
|
Brian Behlendorf
|
1cca71adc5
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-03-11 12:46:59 -07:00 |