Brian Behlendorf
|
9533270a02
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-19 16:27:09 -08:00 |
|
Brian Behlendorf
|
6f718e396c
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:27:08 -08:00 |
|
Brian Behlendorf
|
50c5923533
|
Resolve lingering atomic asm build issues. I think
|
2008-12-19 16:23:26 -08:00 |
|
Brian Behlendorf
|
74e1502cb2
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-19 16:11:14 -08:00 |
|
Brian Behlendorf
|
449c6c9e8b
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:11:13 -08:00 |
|
Brian Behlendorf
|
0581ade42b
|
Add target_cpu
|
2008-12-19 16:07:26 -08:00 |
|
Brian Behlendorf
|
7cb56dc1f8
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-19 16:03:17 -08:00 |
|
Brian Behlendorf
|
22e174cc80
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:03:15 -08:00 |
|
Brian Behlendorf
|
5b205b781d
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-19 16:03:12 -08:00 |
|
Brian Behlendorf
|
1974fe42c2
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:03:07 -08:00 |
|
Brian Behlendorf
|
93f4e49cff
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-19 16:03:05 -08:00 |
|
Brian Behlendorf
|
839db8846c
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:02:59 -08:00 |
|
Brian Behlendorf
|
5fab0fdef1
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-19 16:02:57 -08:00 |
|
Brian Behlendorf
|
7856968a7f
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:02:50 -08:00 |
|
Brian Behlendorf
|
2cfbc50f40
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-19 16:02:47 -08:00 |
|
Brian Behlendorf
|
e95fa23947
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:02:40 -08:00 |
|
Brian Behlendorf
|
a0dfc8d9c2
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-19 16:02:38 -08:00 |
|
Brian Behlendorf
|
2185fac7aa
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:02:30 -08:00 |
|
Brian Behlendorf
|
c3fb5c9924
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-19 16:02:27 -08:00 |
|
Brian Behlendorf
|
1e18261ab4
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:02:21 -08:00 |
|
Brian Behlendorf
|
0a17fd15ed
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-19 16:02:18 -08:00 |
|
Brian Behlendorf
|
17351e45a6
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:02:11 -08:00 |
|
Brian Behlendorf
|
28be3c390b
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-19 16:02:07 -08:00 |
|
Brian Behlendorf
|
70e3d5a096
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:02:01 -08:00 |
|
Brian Behlendorf
|
276908c4dc
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-19 16:01:57 -08:00 |
|
Brian Behlendorf
|
b0d9120282
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:01:51 -08:00 |
|
Brian Behlendorf
|
4f194c9ddb
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-19 16:01:48 -08:00 |
|
Brian Behlendorf
|
f35add0c81
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:01:41 -08:00 |
|
Brian Behlendorf
|
0debf57416
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-19 16:01:38 -08:00 |
|
Brian Behlendorf
|
6b62abef62
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:01:31 -08:00 |
|
Brian Behlendorf
|
663989520b
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-19 16:01:29 -08:00 |
|
Brian Behlendorf
|
79b87053e2
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-19 16:01:27 -08:00 |
|
Brian Behlendorf
|
f52bfc410b
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:01:21 -08:00 |
|
Brian Behlendorf
|
081582b45a
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-19 16:01:18 -08:00 |
|
Brian Behlendorf
|
c1296ffc17
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-19 16:01:18 -08:00 |
|
Brian Behlendorf
|
78eebd3664
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:01:11 -08:00 |
|
Brian Behlendorf
|
6e8e06268d
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-19 16:01:09 -08:00 |
|
Brian Behlendorf
|
8cdb312311
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:01:06 -08:00 |
|
Brian Behlendorf
|
6654b64852
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-19 16:01:04 -08:00 |
|
Brian Behlendorf
|
087b68939f
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:01:00 -08:00 |
|
Brian Behlendorf
|
009918c0fd
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-19 16:00:58 -08:00 |
|
Brian Behlendorf
|
c057bd7b26
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:00:54 -08:00 |
|
Brian Behlendorf
|
a8a668a0a4
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-19 16:00:52 -08:00 |
|
Brian Behlendorf
|
e121518910
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:00:48 -08:00 |
|
Brian Behlendorf
|
5a83adecd9
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-19 16:00:46 -08:00 |
|
Brian Behlendorf
|
9a42fcd838
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:00:42 -08:00 |
|
Brian Behlendorf
|
b3ac41f4c8
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-19 16:00:41 -08:00 |
|
Brian Behlendorf
|
274565e290
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 16:00:37 -08:00 |
|
Brian Behlendorf
|
1b91d3e61f
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-19 16:00:34 -08:00 |
|
Brian Behlendorf
|
b66eafc892
|
Add assembler flags
|
2008-12-19 15:56:04 -08:00 |