#
24fcbace |
| 11-Oct-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master' into upstream-fixes
|
#
0cd61b68 |
| 06-Oct-2006 |
Linus Torvalds <torvalds@g5.osdl.org> |
Initial blind fixup for arm for irq changes
Untested, but this should fix up the bulk of the totally mechanical issues, and should make the actual detail fixing easier.
Signed-off-by: Linus Torvald
Initial blind fixup for arm for irq changes
Untested, but this should fix up the bulk of the totally mechanical issues, and should make the actual detail fixing easier.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
Revision tags: v2.6.19-rc1, v2.6.18, v2.6.18-rc7, v2.6.18-rc6, v2.6.18-rc5, v2.6.18-rc4, v2.6.18-rc3, v2.6.18-rc2, v2.6.18-rc1 |
|
#
05668381 |
| 03-Jul-2006 |
Sam Ravnborg <sam@mars.ravnborg.org> |
Merge branch 'master' of /home/sam/kernel/linux-2.6/
|
#
026477c1 |
| 03-Jul-2006 |
Trond Myklebust <Trond.Myklebust@netapp.com> |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
|
#
0a1340c1 |
| 03-Jul-2006 |
Steven Whitehouse <swhiteho@redhat.com> |
Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/kernel.h
|
#
52e405ea |
| 02-Jul-2006 |
Thomas Gleixner <tglx@linutronix.de> |
[PATCH] ARM: fixup irqflags breakage after ARM genirq merge
The irgflags consolidation did conflict with the ARM to generic IRQ conversion and was not applied for ARM. Fix it up.
Use the new IRQF_
[PATCH] ARM: fixup irqflags breakage after ARM genirq merge
The irgflags consolidation did conflict with the ARM to generic IRQ conversion and was not applied for ARM. Fix it up.
Use the new IRQF_ constants and remove the SA_INTERRUPT define
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
Revision tags: v2.6.17, v2.6.17-rc6, v2.6.17-rc5, v2.6.17-rc4, v2.6.17-rc3, v2.6.17-rc2, v2.6.17-rc1, v2.6.16, v2.6.16-rc6, v2.6.16-rc5, v2.6.16-rc4, v2.6.16-rc3, v2.6.16-rc2 |
|
#
292dd876 |
| 27-Jan-2006 |
Len Brown <len.brown@intel.com> |
Pull release into acpica branch
|
#
0a0fc0dd |
| 24-Jan-2006 |
Dave Kleikamp <shaggy@austin.ibm.com> |
Merge with /home/shaggy/git/linus-clean/
|
#
944d7955 |
| 19-Jan-2006 |
Anton Altaparmakov <aia21@cantab.net> |
Merge branch 'master' of /usr/src/ntfs-2.6/
|
#
ea9b395f |
| 17-Jan-2006 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'upstream'
|
#
0825788f |
| 17-Jan-2006 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'upstream'
|
Revision tags: v2.6.16-rc1 |
|
#
94bc2be3 |
| 12-Jan-2006 |
Steve French <sfrench@us.ibm.com> |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
|
#
8995b161 |
| 07-Jan-2006 |
Linus Torvalds <torvalds@g5.osdl.org> |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
|
#
7cdad482 |
| 04-Jan-2006 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
[ARM] Remove '__address' from scatterlist and convert to DMA API
The old __address element in struct scatterlist remained from older kernels because the ARM DMA emulation code made use of it. Move
[ARM] Remove '__address' from scatterlist and convert to DMA API
The old __address element in struct scatterlist remained from older kernels because the ARM DMA emulation code made use of it. Move this field into struct dma_struct, and convert DMA emulation code to setup a SG entry as required.
Also, convert DMA emulation code to use the new DMA API rather than the PCI DMA API.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
show more ...
|
Revision tags: v2.6.15, v2.6.15-rc7, v2.6.15-rc6, v2.6.15-rc5, v2.6.15-rc4, v2.6.15-rc3, v2.6.15-rc2, v2.6.15-rc1, v2.6.14, v2.6.14-rc5, v2.6.14-rc4, v2.6.14-rc3, v2.6.14-rc2, v2.6.14-rc1, v2.6.13, v2.6.13-rc7, v2.6.13-rc6, v2.6.13-rc5, v2.6.13-rc4, v2.6.13-rc3, v2.6.13-rc2, v2.6.13-rc1, v2.6.12, v2.6.12-rc6, v2.6.12-rc5, v2.6.12-rc4, v2.6.12-rc3, v2.6.12-rc2 |
|
#
1da177e4 |
| 16-Apr-2005 |
Linus Torvalds <torvalds@ppc970.osdl.org> |
Linux-2.6.12-rc2
Initial git repository build. I'm not bothering with the full history, even though we have it. We can create a separate "historical" git archive of that later if we want to, and in
Linux-2.6.12-rc2
Initial git repository build. I'm not bothering with the full history, even though we have it. We can create a separate "historical" git archive of that later if we want to, and in the meantime it's about 3.2GB when imported into git - space that would just make the early git days unnecessarily complicated, when we don't have a lot of good infrastructure for it.
Let it rip!
show more ...
|