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
|
#
65ca68b3 |
| 01-Jul-2006 |
Thomas Gleixner <tglx@linutronix.de> |
[PATCH] irq-flags: sound: Use the new IRQF_ constants
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: "David S. Miller" <davem@davemloft.net> Cc: Benjamin Her
[PATCH] irq-flags: sound: Use the new IRQF_ constants
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: "David S. Miller" <davem@davemloft.net> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Jaroslav Kysela <perex@suse.cz> Cc: Takashi Iwai <tiwai@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
#
55b4d6a5 |
| 29-Jun-2006 |
Dave Jones <davej@redhat.com> |
Merge ../linus
Conflicts:
drivers/char/agp/Kconfig
|
#
62ed948c |
| 26-Jun-2006 |
David Woodhouse <dwmw2@infradead.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
4854c7b2 |
| 26-Jun-2006 |
Dmitry Torokhov <dtor_core@ameritech.net> |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
#
bbe5d235 |
| 25-Jun-2006 |
Steve French <sfrench@us.ibm.com> |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
#
816724e6 |
| 24-Jun-2006 |
Trond Myklebust <Trond.Myklebust@netapp.com> |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch 'VFS: Permit filesystem to overrid
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch 'VFS: Permit filesystem to override root dentry on mount'
show more ...
|
#
8cf60e04 |
| 23-Jun-2006 |
Tony Luck <tony.luck@intel.com> |
Auto-update from upstream
|
#
dbe1ab95 |
| 22-Jun-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master' into upstream
|
#
71d530cd |
| 22-Jun-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master' into upstream
Conflicts:
drivers/scsi/libata-core.c drivers/scsi/libata-scsi.c include/linux/pci_ids.h
|
Revision tags: v2.6.17, v2.6.17-rc6, v2.6.17-rc5 |
|
#
6581f4e7 |
| 17-May-2006 |
Takashi Iwai <tiwai@suse.de> |
[ALSA] Remove zero-initialization of static variables
Removed zero-initializations of static variables. A tiny optimization.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
Revision tags: v2.6.17-rc4 |
|
#
7b7e3941 |
| 29-Apr-2006 |
Dmitry Torokhov <dtor_core@ameritech.net> |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
Revision tags: v2.6.17-rc3 |
|
#
a748422e |
| 21-Apr-2006 |
Steven Whitehouse <swhiteho@redhat.com> |
Merge branch 'master'
|
Revision tags: v2.6.17-rc2 |
|
#
f1f76afd |
| 18-Apr-2006 |
Dave Jones <davej@redhat.com> |
Merge ../linus
|
#
9e73972c |
| 18-Apr-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'upstream'
|
#
b2b4b9a7 |
| 18-Apr-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'upstream'
|
#
4741c336 |
| 18-Apr-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master'
|
#
94171db1 |
| 17-Apr-2006 |
David Woodhouse <dwmw2@infradead.org> |
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
#
2acab771 |
| 14-Apr-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master'
|
#
dcccdd93 |
| 11-Apr-2006 |
Rene Herman <rene.herman@keyaccess.nl> |
[ALSA] unregister platform device again if probe was unsuccessful
Unregister the platform device again if the probe was unsuccessful.
This restores the behaviour of not loading the driver on probe(
[ALSA] unregister platform device again if probe was unsuccessful
Unregister the platform device again if the probe was unsuccessful.
This restores the behaviour of not loading the driver on probe() failure.
Signed-off-by: Rene Herman <rene.herman@keyaccess.nl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
show more ...
|
#
d0ac642d |
| 11-Apr-2006 |
Rene Herman <rene.herman@keyaccess.nl> |
[ALSA] continue on IS_ERR from platform device registration
Continue with the next one on error from device registration.
This would seem the correct thing to do, even if it's not the probe() error
[ALSA] continue on IS_ERR from platform device registration
Continue with the next one on error from device registration.
This would seem the correct thing to do, even if it's not the probe() error that we're getting.
Signed-off-by: Rene Herman <rene.herman@keyaccess.nl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
show more ...
|
Revision tags: v2.6.17-rc1 |
|
#
95d465fd |
| 01-Apr-2006 |
Dmitry Torokhov <dtor_core@ameritech.net> |
Manual merge with Linus.
Conflicts: arch/powerpc/kernel/setup-common.c drivers/input/keyboard/hil_kbd.c drivers/input/mouse/hil_ptr.c
|
#
86579dd0 |
| 31-Mar-2006 |
Steven Whitehouse <swhiteho@redhat.com> |
Merge branch 'master'
|