| #
0b42f15a |
| 02-Oct-2013 |
Simon Klinkert <klinkert@webgods.de> |
Merge remote-tracking branch 'illumos-ml/master' into titanic
Some zev merge conflicts fixed.
Conflicts:
usr/src/uts/common/fs/zfs/zfs_ioctl.c
usr/src/uts/common/fs/zfs/zvol.c
|
| #
694c35fa |
| 29-Jul-2013 |
Josef 'Jeff' Sipek <jeffpc@josefsipek.net> |
3882 Remove xmod & friends
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Richard Lowe <richlowe@richlowe.net>
|
| #
ed31198c |
| 09-Sep-2008 |
John Sonnenschein <John.Sonnenschein@Sun.COM> |
Contributed by Palle Lyckegaard <palle@lyckegaard.dk>
4930079 many Makefiles redefine "CP", causing problems for incrementals
|
| #
7c478bd9 |
| 14-Jun-2005 |
stevel@tonic-gate <none@none> |
OpenSolaris Launch
|