Brian Behlendorf
|
66b97a9465
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-11-24 14:56:55 -08:00 |
|
Brian Behlendorf
|
b714d28e8c
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-11-24 14:56:50 -08:00 |
|
Brian Behlendorf
|
5a948bbf96
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-11-24 14:56:46 -08:00 |
|
Brian Behlendorf
|
cbc7596868
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-11-24 14:56:45 -08:00 |
|
Brian Behlendorf
|
fbcc49426d
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-11-24 14:56:37 -08:00 |
|
Brian Behlendorf
|
7db6f3c776
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-11-24 14:56:33 -08:00 |
|
Brian Behlendorf
|
5096264193
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-11-24 14:56:28 -08:00 |
|
Brian Behlendorf
|
b6c6cf4d73
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-11-24 14:56:23 -08:00 |
|
Brian Behlendorf
|
66af57fba9
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-11-24 14:56:19 -08:00 |
|
Brian Behlendorf
|
bae6de4762
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-11-24 14:56:14 -08:00 |
|
Brian Behlendorf
|
02cc4aa4de
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-11-24 14:56:09 -08:00 |
|
Brian Behlendorf
|
66e594c84e
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-11-24 14:56:00 -08:00 |
|
Brian Behlendorf
|
df6b1cc769
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-11-24 14:55:55 -08:00 |
|
Brian Behlendorf
|
fc1b960434
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-11-24 14:55:50 -08:00 |
|
Brian Behlendorf
|
baa41a63da
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-11-24 14:55:46 -08:00 |
|
Brian Behlendorf
|
8880761d98
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-11-24 14:55:37 -08:00 |
|
Brian Behlendorf
|
114d42f520
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-11-24 14:55:31 -08:00 |
|
Brian Behlendorf
|
45154846fb
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-11-24 14:55:30 -08:00 |
|
Brian Behlendorf
|
ae25d5f4cc
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-11-24 14:55:29 -08:00 |
|
Brian Behlendorf
|
f49a0dadbb
|
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
|
2008-11-24 14:55:29 -08:00 |
|
Brian Behlendorf
|
0e89e627e0
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2008-11-24 14:55:27 -08:00 |
|
Brian Behlendorf
|
2d9ae96d3d
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2008-11-24 14:55:26 -08:00 |
|
Brian Behlendorf
|
5d03437fc0
|
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
|
2008-11-24 14:55:25 -08:00 |
|
Brian Behlendorf
|
58f4400410
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2008-11-24 14:55:25 -08:00 |
|
Brian Behlendorf
|
578cd5b14f
|
Remove unused variable hash
|
2008-11-24 14:52:12 -08:00 |
|
Brian Behlendorf
|
b0b3eb356e
|
Remove unused variable to free up stack
|
2008-11-24 14:50:46 -08:00 |
|
Brian Behlendorf
|
572b26ddc3
|
Resolve 'suggest parentheses' warning which was introduced
|
2008-11-24 14:45:56 -08:00 |
|
Brian Behlendorf
|
b7a263f54b
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-11-24 14:36:28 -08:00 |
|
Brian Behlendorf
|
d1f00b9cfd
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-11-24 14:36:23 -08:00 |
|
Brian Behlendorf
|
80bdd0abb3
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-11-24 14:36:19 -08:00 |
|
Brian Behlendorf
|
812d0f962b
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-11-24 14:36:18 -08:00 |
|
Brian Behlendorf
|
a486a9c444
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-11-24 14:36:11 -08:00 |
|
Brian Behlendorf
|
28b29d4e02
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-11-24 14:36:06 -08:00 |
|
Brian Behlendorf
|
53666aafe8
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-11-24 14:36:02 -08:00 |
|
Brian Behlendorf
|
1b555df770
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-11-24 14:35:58 -08:00 |
|
Brian Behlendorf
|
cf57845193
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-11-24 14:35:53 -08:00 |
|
Brian Behlendorf
|
779f0a8ad3
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-11-24 14:35:49 -08:00 |
|
Brian Behlendorf
|
3222ca35d2
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-11-24 14:35:45 -08:00 |
|
Brian Behlendorf
|
b8348e3163
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-11-24 14:35:36 -08:00 |
|
Brian Behlendorf
|
3ee1e6d221
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-11-24 14:35:31 -08:00 |
|
Brian Behlendorf
|
7cf8a5436a
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-11-24 14:35:27 -08:00 |
|
Brian Behlendorf
|
6a2735c3a5
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-11-24 14:35:23 -08:00 |
|
Brian Behlendorf
|
bd1d77112c
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-11-24 14:35:14 -08:00 |
|
Brian Behlendorf
|
a6338e0139
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-11-24 14:35:08 -08:00 |
|
Brian Behlendorf
|
44346bf5c0
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2008-11-24 14:35:08 -08:00 |
|
Brian Behlendorf
|
12594631ba
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2008-11-24 14:35:06 -08:00 |
|
Brian Behlendorf
|
9922537911
|
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
|
2008-11-24 14:35:06 -08:00 |
|
Brian Behlendorf
|
4b67af72f4
|
Resolve C99 complience issue introduce by patch
|
2008-11-24 14:33:02 -08:00 |
|
Brian Behlendorf
|
5022117874
|
Refresh zpios branch with needed mods to configure.ac
|
2008-11-24 13:58:31 -08:00 |
|
Brian Behlendorf
|
77719c76c7
|
Convert dmu_config.h reference to zfs_config.h reference
|
2008-11-24 13:52:51 -08:00 |
|