| #
312f5726 |
| 20-Oct-2005 |
Dave Airlie <airlied@starflyer.(none)> |
merge Linus head tree into my drm tree and fix up conflicts
|
|
Revision tags: v2.6.14-rc5 |
|
| #
cff6bf97 |
| 18-Oct-2005 |
Trond Myklebust <Trond.Myklebust@netapp.com> |
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
|
| #
7217cbcc |
| 13-Oct-2005 |
Trond Myklebust <Trond.Myklebust@netapp.com> |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
|
Revision tags: v2.6.14-rc4 |
|
| #
012e060c |
| 06-Oct-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
2ee73cc2 |
| 04-Oct-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
| #
3c8c7b2f |
| 03-Oct-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'upstream-fixes'
|
| #
0fbbbf2b |
| 03-Oct-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge libata upstream (which includes C/H/S support) include irq-pio branch.
Merge branch 'upstream'
|
| #
2b235826 |
| 03-Oct-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
|
Revision tags: v2.6.14-rc3 |
|
| #
ab11d1ea |
| 28-Sep-2005 |
Paul Mackerras <paulus@samba.org> |
Merge by hand from Linus' tree.
Signed-off-by: Paul Mackerras <paulus@samba.org>
|
| #
5a8c0cc3 |
| 26-Sep-2005 |
Anton Altaparmakov <aia21@cantab.net> |
NTFS: More $LogFile handling fixes: when chkdsk has been run, it can leave the
restart pages in the journal without multi sector transfer protection
fixups (i.e. the update sequence array
NTFS: More $LogFile handling fixes: when chkdsk has been run, it can leave the
restart pages in the journal without multi sector transfer protection
fixups (i.e. the update sequence array is empty and in fact does not
exist).
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
show more ...
|
| #
4e0c1159 |
| 24-Sep-2005 |
Dave Airlie <airlied@starflyer.(none)> |
update from upstream
|
|
Revision tags: v2.6.14-rc2 |
|
| #
dbaa9a9d |
| 14-Sep-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
| #
905ec87e |
| 14-Sep-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
| #
165415f7 |
| 14-Sep-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
| #
d7f6884a |
| 14-Sep-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
|
Revision tags: v2.6.14-rc1 |
|
| #
d344c5e0 |
| 09-Sep-2005 |
Dmitry Torokhov <dtor_core@ameritech.net> |
Manual merge with Linus
|
| #
8ccc4577 |
| 09-Sep-2005 |
Greg KH <gregkh@suse.de> |
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
|
| #
e7a1033b |
| 08-Sep-2005 |
Anton Altaparmakov <aia21@cantab.net> |
NTFS: Support more clean journal ($LogFile) states.
- Support journals ($LogFile) which have been modified by chkdsk. This
means users can boot into Windows after we marked the volume
NTFS: Support more clean journal ($LogFile) states.
- Support journals ($LogFile) which have been modified by chkdsk. This
means users can boot into Windows after we marked the volume dirty.
The Windows boot will run chkdsk and then reboot. The user can then
immediately boot into Linux rather than having to do a full Windows
boot first before rebooting into Linux and we will recognize such a
journal and empty it as it is clean by definition.
- Support journals ($LogFile) with only one restart page as well as
journals with two different restart pages. We sanity check both and
either use the only sane one or the more recent one of the two in the
case that both are valid.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
show more ...
|
| #
c1b054d0 |
| 29-Aug-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
| #
2fca877b |
| 29-Aug-2005 |
Jeff Garzik <jgarzik@pobox.com> |
/spare/repo/libata-dev branch 'v2.6.13'
|
|
Revision tags: v2.6.13, v2.6.13-rc7 |
|
| #
a8b3e6f1 |
| 18-Aug-2005 |
Dave Jones <davej@redhat.com> |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
2f058256 |
| 10-Aug-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/linux-2.6/
|
|
Revision tags: v2.6.13-rc6, v2.6.13-rc5 |
|
| #
de745fb2 |
| 30-Jul-2005 |
Jeff Garzik <jgarzik@pobox.com> |
/spare/repo/netdev-2.6 branch 'ieee80211'
|
| #
a670fcb4 |
| 30-Jul-2005 |
Jeff Garzik <jgarzik@pobox.com> |
/spare/repo/netdev-2.6 branch 'master'
|
| #
bdf242ee |
| 29-Jul-2005 |
Dave Airlie <airlied@starflyer.(none)> |
Merge ../linux-2.6/
|