| #
b92efa9a |
| 27-Mar-2009 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into avr32-arch
|
| #
08abe18a |
| 26-Mar-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wimax/i2400m/usb-notif.c
|
| #
1987f17d |
| 26-Mar-2009 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
| #
0384e295 |
| 26-Mar-2009 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (35 commits)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (35 commits)
[libata] Improve timeout handling
[libata] Drain data on errors
pata_sc1200: Activate secondary channel
pata_artop: Serializing support
[libata] ahci: correct enclosure LED state save
[libata] More robust parsing for IDENTIFY DEVICE multi_count field
sata_mv: fix LED blinking for SoC+NCQ
sata_mv: optimize IRQ coalescing for 8-port chips
sata_mv: implement IRQ coalescing (v2)
sata_mv: cosmetic preparations for IRQ coalescing
pata-rb532-cf: platform_get_irq() fix ignored failure
pata_efar: fix *dma_mask
pata_radisys: fix mwdma_mask to exclude mwdma0
[libata] convert drivers to use ata.h mode mask defines
include/linux/ata.h: add some more transfer masks
ahci: Blacklist HP Compaq 6720s that spins off disks during ACPI power off
[libata] sata_mv: Implement direct FIS transmission via mv_qc_issue_fis().
[libata] Export ata_pio_queue_task() so that it can be used from sata_mv.
[libata] sata_mv: Add a new mv_sff_check_status() function to sata_mv.
[libata] sata_mv: Tighten up interrupt masking in mv_qc_issue()
...
show more ...
|
|
Revision tags: v2.6.29 |
|
| #
14bdef98 |
| 14-Mar-2009 |
Erik Inge Bolsø <knan-lkml@anduin.net> |
[libata] convert drivers to use ata.h mode mask defines
No functional changes in this patch.
Signed-off-by: Erik Inge Bolsø <knan-lkml@anduin.net>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
|
|
Revision tags: v2.6.29-rc8, v2.6.29-rc7, v2.6.29-rc6, v2.6.29-rc5, v2.6.29-rc4, v2.6.29-rc3, v2.6.29-rc2, v2.6.29-rc1 |
|
| #
a9de18eb |
| 31-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into stackprotector
Conflicts:
arch/x86/include/asm/pda.h
kernel/fork.c
|
|
Revision tags: v2.6.28 |
|
| #
55fa5188 |
| 20-Dec-2008 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/pcsp-fix' into topic/misc
|
| #
93b8eef1 |
| 20-Dec-2008 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.28-rc9' into next
|
| #
0ff55519 |
| 19-Dec-2008 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/hda' into topic/hda
|
|
Revision tags: v2.6.28-rc9 |
|
| #
78f902cc |
| 16-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc8' into x86/doc
|
| #
e18d7af8 |
| 12-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc8' into x86/mm
|
|
Revision tags: v2.6.28-rc8, v2.6.28-rc7 |
|
| #
3af4182c |
| 01-Dec-2008 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'upstream' into topic/asoc
|
| #
7fbb8759 |
| 26-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc6' into core/debug
|
| #
3e1d7a62 |
| 24-Nov-2008 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into core/futexes
|
|
Revision tags: v2.6.28-rc6 |
|
| #
90accd6f |
| 20-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/memory-corruption-check
|
| #
fbc2a060 |
| 20-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/uv
|
| #
dba0a918 |
| 19-Nov-2008 |
David Vrabel <david.vrabel@csr.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
|
|
Revision tags: v2.6.28-rc5 |
|
| #
708b8eae |
| 12-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/locking
|
| #
4ecd33d9 |
| 10-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc4' into x86/apic
|
| #
a5a64498 |
| 10-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc4' into timers/rtc
Conflicts:
drivers/rtc/rtc-cmos.c
|
|
Revision tags: v2.6.28-rc4 |
|
| #
895e0317 |
| 08-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/cleanups
|
| #
e21e696e |
| 05-Nov-2008 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
|
Revision tags: v2.6.28-rc3 |
|
| #
0803d540 |
| 31-Oct-2008 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
a1744d3b |
| 31-Oct-2008 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/p54/p54common.c
|
| #
e1e302d8 |
| 30-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/ftrace
|