Brian Behlendorf
|
25a9c48ccc
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2009-01-20 15:45:49 -08:00 |
|
Brian Behlendorf
|
41b62d6b5d
|
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
|
2009-01-20 15:45:48 -08:00 |
|
Brian Behlendorf
|
022d01e0d4
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-20 15:45:47 -08:00 |
|
Brian Behlendorf
|
87718a9290
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2009-01-20 15:45:46 -08:00 |
|
Brian Behlendorf
|
4710ede86a
|
Add GIT to master
|
2009-01-20 15:43:44 -08:00 |
|
Brian Behlendorf
|
26d0de9a92
|
Update Makefiles for recent script updates
|
2009-01-20 15:43:21 -08:00 |
|
Brian Behlendorf
|
c4ff7b9e7c
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-20 15:38:20 -08:00 |
|
Brian Behlendorf
|
106f128f71
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-20 15:38:19 -08:00 |
|
Brian Behlendorf
|
8e976f7fcf
|
Moving GIT to master for easier reference
|
2009-01-20 15:35:40 -08:00 |
|
Brian Behlendorf
|
af43246767
|
Minor script cleanup
|
2009-01-20 15:34:38 -08:00 |
|
Brian Behlendorf
|
521f8f2000
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-20 14:17:37 -08:00 |
|
Brian Behlendorf
|
e460c5ccf7
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-20 14:17:36 -08:00 |
|
Brian Behlendorf
|
5ae334d138
|
Use .sh extension
|
2009-01-20 14:15:05 -08:00 |
|
Brian Behlendorf
|
69a9253df2
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-20 14:13:08 -08:00 |
|
Brian Behlendorf
|
84be1f196c
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-20 14:13:08 -08:00 |
|
Brian Behlendorf
|
db210bf236
|
Add destroy functionality to zpool create, needed for generic use by zpios.sh
|
2009-01-20 14:10:30 -08:00 |
|
Brian Behlendorf
|
e74df386c4
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-16 14:55:08 -08:00 |
|
Brian Behlendorf
|
13a2ef20ed
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-16 14:55:08 -08:00 |
|
Brian Behlendorf
|
5bf49743a6
|
Add minor root check for convenience
|
2009-01-16 14:51:52 -08:00 |
|
Brian Behlendorf
|
86f5d77de7
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-16 14:32:15 -08:00 |
|
Brian Behlendorf
|
3532303b80
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-16 14:32:14 -08:00 |
|
Brian Behlendorf
|
6a6da5a14d
|
Minor verbage cleanup
|
2009-01-16 14:29:31 -08:00 |
|
Brian Behlendorf
|
91641cf998
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-16 13:59:46 -08:00 |
|
Brian Behlendorf
|
393c858e47
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-16 13:59:45 -08:00 |
|
Brian Behlendorf
|
7b5ceef9df
|
Minor fixes
|
2009-01-16 13:57:12 -08:00 |
|
Brian Behlendorf
|
073aeead9c
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-16 13:28:17 -08:00 |
|
Brian Behlendorf
|
e2962d71fd
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-16 13:28:17 -08:00 |
|
Brian Behlendorf
|
89ed048230
|
Minor script updates almost ready to test
|
2009-01-16 13:25:47 -08:00 |
|
Brian Behlendorf
|
531b32d8c5
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-16 12:56:34 -08:00 |
|
Brian Behlendorf
|
6db4c9637f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-16 12:56:33 -08:00 |
|
Brian Behlendorf
|
7c761d45a8
|
Further work towards getting zpool-create working
|
2009-01-16 12:53:12 -08:00 |
|
Brian Behlendorf
|
230fea90c1
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-16 12:11:36 -08:00 |
|
Brian Behlendorf
|
24f3d85fd0
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-16 12:11:34 -08:00 |
|
Brian Behlendorf
|
b38eb997f4
|
Update helper scripts to me more helpful
|
2009-01-16 12:06:25 -08:00 |
|
Brian Behlendorf
|
cd983096ab
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-15 16:42:45 -08:00 |
|
Brian Behlendorf
|
75a0fcf23f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-15 16:42:43 -08:00 |
|
Brian Behlendorf
|
2f2120f885
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-15 16:41:09 -08:00 |
|
Brian Behlendorf
|
498800d66a
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-15 16:41:07 -08:00 |
|
Brian Behlendorf
|
e9a0807176
|
Remove fix-locks dependency this topic branch was accepted upstream and can now be removed
|
2009-01-15 16:36:11 -08:00 |
|
Brian Behlendorf
|
c090c8b1aa
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-15 16:32:10 -08:00 |
|
Brian Behlendorf
|
41cba9f136
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-15 16:32:08 -08:00 |
|
Brian Behlendorf
|
fb256294c9
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-15 16:30:29 -08:00 |
|
Brian Behlendorf
|
c5b335f613
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2009-01-15 16:30:28 -08:00 |
|
Brian Behlendorf
|
68be1291b7
|
Merge commit 'refs/top-bases/fix-branch' into fix-branch
|
2009-01-15 16:30:26 -08:00 |
|
Brian Behlendorf
|
31cddc8a0b
|
Merge branch 'fix-locks' into refs/top-bases/fix-branch
|
2009-01-15 16:30:25 -08:00 |
|
Brian Behlendorf
|
50186c2b57
|
All init and destroy initialized pulled in
|
2009-01-15 16:25:25 -08:00 |
|
Brian Behlendorf
|
7d4fe54632
|
txg_init/txg_fini cv_* initialized pulled in upstream in a slightly different way, drop these now redundant versions
|
2009-01-15 16:22:23 -08:00 |
|
Brian Behlendorf
|
92f060cc37
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-15 15:55:18 -08:00 |
|
Brian Behlendorf
|
99a9817275
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-15 15:55:17 -08:00 |
|
Brian Behlendorf
|
85c77e1c82
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-15 15:54:35 -08:00 |