Brian Behlendorf
|
cf3c0c4bdc
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-15 16:54:37 -08:00 |
|
Brian Behlendorf
|
acf0981efc
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-15 16:54:36 -08:00 |
|
Brian Behlendorf
|
28a76a7bb2
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:54:24 -08:00 |
|
Brian Behlendorf
|
bac93e9e59
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-15 16:54:20 -08:00 |
|
Brian Behlendorf
|
e73f812fed
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:54:13 -08:00 |
|
Brian Behlendorf
|
325b381298
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-15 16:54:09 -08:00 |
|
Brian Behlendorf
|
be8f47781d
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:54:03 -08:00 |
|
Brian Behlendorf
|
be3d928df8
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-15 16:53:59 -08:00 |
|
Brian Behlendorf
|
c3b28ad560
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:53:53 -08:00 |
|
Brian Behlendorf
|
8f1a2e9277
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-15 16:53:45 -08:00 |
|
Brian Behlendorf
|
cee94755c2
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:53:38 -08:00 |
|
Brian Behlendorf
|
9f71257942
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-15 16:53:34 -08:00 |
|
Brian Behlendorf
|
9c2caef557
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:53:27 -08:00 |
|
Brian Behlendorf
|
34a202c55c
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-15 16:53:23 -08:00 |
|
Brian Behlendorf
|
de0355b2e7
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:53:15 -08:00 |
|
Brian Behlendorf
|
6b95753dd5
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-15 16:53:08 -08:00 |
|
Brian Behlendorf
|
cc420402bf
|
Moving addition configure checks to m4 macros
|
2008-12-15 16:46:34 -08:00 |
|
Brian Behlendorf
|
e639b049ee
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:38:13 -08:00 |
|
Brian Behlendorf
|
afc8e4c314
|
Conflict
|
2008-12-15 16:38:04 -08:00 |
|
Brian Behlendorf
|
1b25a404c5
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:37:38 -08:00 |
|
Brian Behlendorf
|
5a8b8a50e6
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-15 16:37:34 -08:00 |
|
Brian Behlendorf
|
e6b20dff7e
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:37:27 -08:00 |
|
Brian Behlendorf
|
741a9921eb
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-15 16:37:23 -08:00 |
|
Brian Behlendorf
|
4076baaddc
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:37:17 -08:00 |
|
Brian Behlendorf
|
accc1cd03f
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-15 16:37:12 -08:00 |
|
Brian Behlendorf
|
930fdf7e61
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:37:05 -08:00 |
|
Brian Behlendorf
|
682105e5a1
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-15 16:37:02 -08:00 |
|
Brian Behlendorf
|
c9c4efc6b9
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:36:54 -08:00 |
|
Brian Behlendorf
|
9879c22fbd
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-15 16:36:50 -08:00 |
|
Brian Behlendorf
|
08be2f5633
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:36:42 -08:00 |
|
Brian Behlendorf
|
15506fc558
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-15 16:36:39 -08:00 |
|
Brian Behlendorf
|
2b843e0065
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:36:32 -08:00 |
|
Brian Behlendorf
|
00f13fdfda
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-15 16:36:28 -08:00 |
|
Brian Behlendorf
|
9df0130b60
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:36:20 -08:00 |
|
Brian Behlendorf
|
971caea159
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-15 16:36:16 -08:00 |
|
Brian Behlendorf
|
67ef50a7f2
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:36:09 -08:00 |
|
Brian Behlendorf
|
418a6d4a31
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-15 16:36:05 -08:00 |
|
Brian Behlendorf
|
3a68a30b10
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:35:57 -08:00 |
|
Brian Behlendorf
|
02f9655041
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-15 16:35:53 -08:00 |
|
Brian Behlendorf
|
5e78680e5d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-15 16:35:51 -08:00 |
|
Brian Behlendorf
|
64f3f5bd48
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:35:39 -08:00 |
|
Brian Behlendorf
|
5279cd9c18
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-15 16:35:35 -08:00 |
|
Brian Behlendorf
|
5b92804928
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-15 16:35:33 -08:00 |
|
Brian Behlendorf
|
e0481c4c63
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:35:21 -08:00 |
|
Brian Behlendorf
|
e65080d8da
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-15 16:35:18 -08:00 |
|
Brian Behlendorf
|
be1621eda4
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:35:12 -08:00 |
|
Brian Behlendorf
|
ae47c7cbd3
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-15 16:35:09 -08:00 |
|
Brian Behlendorf
|
c02b45f523
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:35:02 -08:00 |
|
Brian Behlendorf
|
c798730bdd
|
Conflict
|
2008-12-15 16:34:48 -08:00 |
|
Brian Behlendorf
|
aeccffa60a
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-15 16:34:19 -08:00 |