| #
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, v2.6.13-rc4 |
|
| #
08cd84c8 |
| 13-Jul-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
|
| #
c5147207 |
| 13-Jul-2005 |
Anton Altaparmakov <aia21@cantab.net> |
Automatic merge with /usr/src/ntfs-2.6.git.
|
| #
327309e8 |
| 13-Jul-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
|
| #
30beab14 |
| 13-Jul-2005 |
David Woodhouse <dwmw2@shinybook.infradead.org> |
Merge with /shiny/git/linux-2.6/.git
|
| #
f7f24758 |
| 13-Jul-2005 |
Dave Kleikamp <shaggy@austin.ibm.com> |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
|
|
Revision tags: v2.6.13-rc3 |
|
| #
a98a5d04 |
| 11-Jul-2005 |
Todd Poynor <tpoynor@mvista.com> |
Merge with rsync://fileserver/linux
|
| #
c27510c0 |
| 12-Jul-2005 |
Steve French <sfrench@hera.kernel.org> |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
| #
e0d21d9c |
| 11-Jul-2005 |
Dmitry Torokhov <dtor_core@ameritech.net> |
Merge rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
88c3cdfd |
| 08-Jul-2005 |
Tony Luck <tony.luck@intel.com> |
Auto merge with /home/aegl/GIT/linus
|
| #
89b39f5d |
| 07-Jul-2005 |
Dominik Brodowski <linux@dominikbrodowski.net> |
[PATCH] yenta: don't depend on CardBus
As a follow-up, we can allow the yenta-driver to be limited to PCMCIA
operation.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by:
[PATCH] yenta: don't depend on CardBus
As a follow-up, we can allow the yenta-driver to be limited to PCMCIA
operation.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
|
Revision tags: v2.6.13-rc2 |
|
| #
d2f64095 |
| 02-Jul-2005 |
David Woodhouse <dwmw2@shinybook.infradead.org> |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
|
Revision tags: v2.6.13-rc1 |
|
| #
f45727d5 |
| 26-Jun-2005 |
Jeff Garzik <jgarzik@pretzel.yyz.us> |
Merge /spare/repo/netdev-2.6/ branch 'ieee80211'
|
| #
5696c194 |
| 26-Jun-2005 |
Jeff Garzik <jgarzik@pretzel.yyz.us> |
Merge /spare/repo/linux-2.6/
|
| #
aef7b83c |
| 26-Jun-2005 |
Jeff Garzik <jgarzik@pretzel.yyz.us> |
Merge /spare/repo/linux-2.6/
|
| #
7ca6448d |
| 26-Jun-2005 |
Thomas Gleixner <tglx@tglx.tec.linutronix.de> |
Merge with rsync://fileserver/linux
Update to Linus latest
|
| #
8b0ee07e |
| 26-Jun-2005 |
Jeff Garzik <jgarzik@pretzel.yyz.us> |
Merge upstream (approx. 2.6.12-git8) into 'janitor' branch of netdev-2.6.
|
| #
38b22b6e |
| 25-Jun-2005 |
Anton Altaparmakov <aia21@cantab.net> |
Automerge with /usr/src/ntfs-2.6.git.
|
| #
fa5cfae3 |
| 23-Jun-2005 |
Steve French <sfrench@hera.kernel.org> |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
| #
fa912bcb |
| 23-Jun-2005 |
Daniel Ritz <daniel.ritz@gmx.ch> |
[PATCH] yenta TI: turn off interrupts during card power-on #2
- make boot-up card recognition more reliable (ie. redo interrogation
always if there is no valid 'card inserted' state) (and yes, i
[PATCH] yenta TI: turn off interrupts during card power-on #2
- make boot-up card recognition more reliable (ie. redo interrogation
always if there is no valid 'card inserted' state) (and yes, i saw it
happening on an o2micro controller that both CB_CBARD and CB_16BITCARD
bits were set at the same time)
- also redo interrogation before probing the ISA interrupts. it's safer
to do the probing with the socket in a clean state.
- make card insert detect more reliable. yenta_get_status() now returns
SS_PENDING as long as the card is not completley inserted and one of the
voltage bits is set. also !CB_CBARD doesn't mean CB_16BITCARD. there is
CB_NOTACARD as well, so make an explicit check for CB_16BITCARD.
- for TI bridges: disable IRQs during power-on. in all-serial and tied
interrupt mode the interrupts are always disabled for single-slot
controllers. for two-slot contollers the disabling is only done when the
other slot is empty. to force disabling there is a new module parameter
now: pwr_irqs_off=Y (which is a regression for working setups. that's
why it's an option, only use when required)
- modparm to disable ISA interrupt probing (isa_probe, defaults to on)
- remove unneeded code/cleanups (ie. merge yenta_events() into
yenta_interrupts())
Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
|
Revision tags: v2.6.12 |
|
| #
f2cbb4f0 |
| 15-Jun-2005 |
Tony Luck <tony.luck@intel.com> |
Auto merge with /home/aegl/GIT/linus
|
|
Revision tags: v2.6.12-rc6 |
|
| #
7078253c |
| 02-Jun-2005 |
Dave Kleikamp <shaggy@austin.ibm.com> |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
|
|
Revision tags: v2.6.12-rc5 |
|
| #
67394f8f |
| 21-May-2005 |
Anton Altaparmakov <aia21@cantab.net> |
Merge with /usr/src/ntfs-2.6.git
|
| #
ad34ea2c |
| 20-May-2005 |
James Bottomley <jejb@titanic.(none)> |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
|
|
Revision tags: v2.6.12-rc4 |
|
| #
c835a388 |
| 05-May-2005 |
Daniel Ritz <daniel.ritz@gmx.ch> |
[PATCH] pcmcia: yenta TI: align irq of func1 to func0 if INTRTIE is set
Make sure that if the INTRTIE bit is set both functions of the cardbus
bridge use the same IRQ before doing any probing...
[
[PATCH] pcmcia: yenta TI: align irq of func1 to func0 if INTRTIE is set
Make sure that if the INTRTIE bit is set both functions of the cardbus
bridge use the same IRQ before doing any probing...
[ yes i hate the TI bridges for the fact that they are very flexible
so that so many BIOS vendors get it wrong. ]
Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|