Brian Behlendorf
|
541fe61a34
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:00:20 -08:00 |
|
Brian Behlendorf
|
2c028659ab
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-11 15:00:19 -08:00 |
|
Brian Behlendorf
|
85df356322
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:00:15 -08:00 |
|
Brian Behlendorf
|
707c548a35
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-11 15:00:14 -08:00 |
|
Brian Behlendorf
|
1c76983586
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:00:11 -08:00 |
|
Brian Behlendorf
|
589e125bab
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-11 15:00:10 -08:00 |
|
Brian Behlendorf
|
4f564c40dc
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:00:06 -08:00 |
|
Brian Behlendorf
|
07121d5189
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-11 15:00:05 -08:00 |
|
Brian Behlendorf
|
5c9502d6e8
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:00:02 -08:00 |
|
Brian Behlendorf
|
477a85d905
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-11 15:00:01 -08:00 |
|
Brian Behlendorf
|
7b5e2835b1
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:59:58 -08:00 |
|
Brian Behlendorf
|
6d37a4ad97
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-11 14:59:57 -08:00 |
|
Brian Behlendorf
|
e9c415ec2d
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:59:53 -08:00 |
|
Brian Behlendorf
|
d68cecbb9d
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-11 14:59:52 -08:00 |
|
Brian Behlendorf
|
1ac058d938
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:59:49 -08:00 |
|
Brian Behlendorf
|
c35e513cc4
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-11 14:59:48 -08:00 |
|
Brian Behlendorf
|
347e860de3
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-11 14:59:47 -08:00 |
|
Brian Behlendorf
|
b256a78467
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:59:42 -08:00 |
|
Brian Behlendorf
|
409a33d29e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-11 14:59:41 -08:00 |
|
Brian Behlendorf
|
515c1981f2
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-11 14:59:39 -08:00 |
|
Brian Behlendorf
|
106c43dc72
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:59:33 -08:00 |
|
Brian Behlendorf
|
f46d4ce0a4
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-11 14:59:32 -08:00 |
|
Brian Behlendorf
|
10ec661566
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:59:29 -08:00 |
|
Brian Behlendorf
|
72a1fc3136
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-11 14:59:28 -08:00 |
|
Brian Behlendorf
|
6d21860354
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:59:25 -08:00 |
|
Brian Behlendorf
|
f27584417a
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-11 14:59:24 -08:00 |
|
Brian Behlendorf
|
9318f703ca
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:59:20 -08:00 |
|
Brian Behlendorf
|
8c36a46321
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-11 14:59:19 -08:00 |
|
Brian Behlendorf
|
7793ee2fe9
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:59:16 -08:00 |
|
Brian Behlendorf
|
2bf77383ee
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-11 14:59:15 -08:00 |
|
Brian Behlendorf
|
010d8ed976
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:59:11 -08:00 |
|
Brian Behlendorf
|
74fe6e7746
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-11 14:59:10 -08:00 |
|
Brian Behlendorf
|
a3c66a6b89
|
Resolve conflict
|
2008-12-11 14:58:34 -08:00 |
|
Brian Behlendorf
|
015dc79c75
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-11 14:57:39 -08:00 |
|
Brian Behlendorf
|
593aa3e10d
|
Move all current Makefiles to correct locations, updates still needed
|
2008-12-11 14:55:55 -08:00 |
|
Brian Behlendorf
|
c5ab526589
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:27:10 -08:00 |
|
Brian Behlendorf
|
a4a44a76d4
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-11 14:27:09 -08:00 |
|
Brian Behlendorf
|
dc710d2250
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:27:05 -08:00 |
|
Brian Behlendorf
|
01531d559d
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-11 14:27:03 -08:00 |
|
Brian Behlendorf
|
dbf58baf75
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:27:00 -08:00 |
|
Brian Behlendorf
|
a11327542c
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-11 14:26:58 -08:00 |
|
Brian Behlendorf
|
34e9248eb7
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:26:55 -08:00 |
|
Brian Behlendorf
|
b6bcc8a256
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-11 14:26:53 -08:00 |
|
Brian Behlendorf
|
d86208dece
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:26:50 -08:00 |
|
Brian Behlendorf
|
60faa25477
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-11 14:26:49 -08:00 |
|
Brian Behlendorf
|
12b0e8498c
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:26:45 -08:00 |
|
Brian Behlendorf
|
d02eadea4a
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-11 14:26:44 -08:00 |
|
Brian Behlendorf
|
5a9c9b5272
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:26:40 -08:00 |
|
Brian Behlendorf
|
516c92283a
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-11 14:26:39 -08:00 |
|
Brian Behlendorf
|
e200bdcf00
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:26:35 -08:00 |