Brian Behlendorf
|
a3b1a94fa6
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-05 15:06:11 -08:00 |
|
Brian Behlendorf
|
191ab71dd9
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-05 15:06:10 -08:00 |
|
Brian Behlendorf
|
bb8ad92922
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-05 15:06:07 -08:00 |
|
Brian Behlendorf
|
ac371c327e
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-05 15:06:07 -08:00 |
|
Brian Behlendorf
|
83d40482a2
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-05 15:06:04 -08:00 |
|
Brian Behlendorf
|
81ecc0dd51
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-05 15:06:03 -08:00 |
|
Brian Behlendorf
|
2e7e6d3280
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-05 15:06:00 -08:00 |
|
Brian Behlendorf
|
a6dc9747dd
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-05 15:06:00 -08:00 |
|
Brian Behlendorf
|
b64f3854da
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-05 15:05:59 -08:00 |
|
Brian Behlendorf
|
f494eef056
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-05 15:05:54 -08:00 |
|
Brian Behlendorf
|
ad724757cc
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-05 15:05:54 -08:00 |
|
Brian Behlendorf
|
10930cd0e6
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-05 15:05:53 -08:00 |
|
Brian Behlendorf
|
0d45ae62bb
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-05 15:05:48 -08:00 |
|
Brian Behlendorf
|
ebf02e2a69
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-05 15:05:47 -08:00 |
|
Brian Behlendorf
|
f1c120dc62
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-05 15:05:44 -08:00 |
|
Brian Behlendorf
|
58ea83c1d3
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-05 15:05:44 -08:00 |
|
Brian Behlendorf
|
960af279ae
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-05 15:05:41 -08:00 |
|
Brian Behlendorf
|
3dd0dbae54
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-05 15:05:40 -08:00 |
|
Brian Behlendorf
|
5447f5a7d7
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-05 15:05:37 -08:00 |
|
Brian Behlendorf
|
fdbd114494
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-05 15:05:36 -08:00 |
|
Brian Behlendorf
|
59ddff3f88
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-05 15:05:34 -08:00 |
|
Brian Behlendorf
|
1b88747214
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-05 15:05:33 -08:00 |
|
Brian Behlendorf
|
f91b38db75
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-05 15:05:30 -08:00 |
|
Brian Behlendorf
|
7cf35f7dba
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-05 15:05:29 -08:00 |
|
Brian Behlendorf
|
e27fb5142e
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-05 15:05:26 -08:00 |
|
Brian Behlendorf
|
e36f930abc
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-05 15:05:25 -08:00 |
|
Brian Behlendorf
|
644386044b
|
Add -Wno-unknown-pragmas
|
2008-12-05 15:03:48 -08:00 |
|
Brian Behlendorf
|
baeec59dc3
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:58:59 -08:00 |
|
Brian Behlendorf
|
5264a76696
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-05 14:58:58 -08:00 |
|
Brian Behlendorf
|
2df4eb1792
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-05 14:58:55 -08:00 |
|
Brian Behlendorf
|
506ebd1196
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:58:55 -08:00 |
|
Brian Behlendorf
|
7c8202458c
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:58:52 -08:00 |
|
Brian Behlendorf
|
d4049b33c4
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-05 14:58:51 -08:00 |
|
Brian Behlendorf
|
3d91e41dbe
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:58:48 -08:00 |
|
Brian Behlendorf
|
ec83f26aee
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-05 14:58:47 -08:00 |
|
Brian Behlendorf
|
03b30ef16b
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:58:45 -08:00 |
|
Brian Behlendorf
|
9f228d68d9
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-05 14:58:44 -08:00 |
|
Brian Behlendorf
|
3ea1fbdb1c
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:58:41 -08:00 |
|
Brian Behlendorf
|
806e660116
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-05 14:58:40 -08:00 |
|
Brian Behlendorf
|
71d765a392
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-05 14:58:37 -08:00 |
|
Brian Behlendorf
|
17956c43bd
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:58:37 -08:00 |
|
Brian Behlendorf
|
b032f6706d
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:58:34 -08:00 |
|
Brian Behlendorf
|
369e865989
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-05 14:58:33 -08:00 |
|
Brian Behlendorf
|
2e173c0882
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:58:30 -08:00 |
|
Brian Behlendorf
|
eba975d32f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-05 14:58:29 -08:00 |
|
Brian Behlendorf
|
33db2b8914
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:58:27 -08:00 |
|
Brian Behlendorf
|
9f0e6c4e0b
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-05 14:58:26 -08:00 |
|
Brian Behlendorf
|
d923b52ac7
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-05 14:58:25 -08:00 |
|
Brian Behlendorf
|
c5d3c3715c
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:58:21 -08:00 |
|
Brian Behlendorf
|
e3b9592641
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-05 14:58:20 -08:00 |