David Fries
af00a2d5a0
W1: w1_int.c use first available master number ...
Follow the example of other devices (like the joystick device). Pick the
first available id for each detected device. Currently for USB devices,
suspending and resuming would cause the number to increment.
Signed-off-by: David Fries <david@fries.net>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-10-16 11:21:50 -07:00
rtc-cmos: move wake setup from ACPI glue into RTC driver
2008-10-14 16:08:21 -07:00
Merge commit 'origin'
2008-10-15 11:31:54 +11:00
firmware: use dev_printk when possible
2008-10-16 11:21:47 -07:00
Merge commit 'origin'
2008-10-15 11:31:54 +11:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2008-10-13 14:12:40 -07:00
drivers/char/tpm/tpm.c: fix error-path memory leak
2008-10-16 11:21:49 -07:00
edac i5000: fix thermal issues
2008-10-16 11:21:48 -07:00
gpiolib: request/free hooks
2008-10-16 11:21:40 -07:00
misc: replace __FUNCTION__ with __func__
2008-10-16 11:21:30 -07:00
HID: build drivers for all quirky devices by default
2008-10-14 23:51:05 +02:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2008-10-15 08:07:35 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2008-10-15 08:07:35 -07:00
Kconfig: eliminate "def_bool n" constructs
2008-10-16 11:21:31 -07:00
vfs: Use const for kernel parser table
2008-10-13 10:10:37 -07:00
omap drivers: switch to standard GPIO calls
2008-10-16 11:21:40 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2008-10-14 10:28:49 -07:00
raid, fastboot: hide RAID autodetect option if MD is compiled as a module
2008-10-12 08:25:14 -07:00
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
2008-10-13 14:03:59 -07:00
i2o: Fix 32/64bit DMA locking
2008-10-16 11:21:38 -07:00
mfd: Fix warning in WM8350
2008-10-13 21:51:57 +01:00
AT91: atmel_pwm only available for certain AT91 processors
2008-10-16 11:21:32 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
2008-10-13 17:13:56 +01:00
omap drivers: switch to standard GPIO calls
2008-10-16 11:21:40 -07:00
Remove Andrew Morton's old email accounts
2008-10-16 11:21:32 -07:00
nubus: fix mis-indented statement
2008-10-16 11:21:30 -07:00
Merge commit 'gcl/gcl-next'
2008-10-14 10:11:27 +11:00
Merge branch 'linus' into oprofile-v2
2008-10-13 11:05:51 +02:00
parport: remove CVS keywords
2008-10-16 11:21:49 -07:00
Merge commit 'origin'
2008-10-15 11:31:54 +11:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2008-10-13 14:12:40 -07:00
pnp: make the resource type an unsigned long
2008-10-16 11:21:45 -07:00
olpc: olpc_battery.c sparse endian annotations
2008-10-16 11:21:30 -07:00
da903x: add regulator support for DA9030/DA9034
2008-10-13 21:51:57 +01:00
rtc-ds1672 new style driver
2008-10-16 11:21:40 -07:00
misc: replace __FUNCTION__ with __func__
2008-10-16 11:21:30 -07:00
m68k: Atari SCSI needs NVRAM
2008-10-14 10:23:27 -07:00
Merge commit 'origin'
2008-10-15 11:31:54 +11:00
spi: core and gpio expanders use subsys_init
2008-10-16 11:21:38 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2008-10-13 14:12:40 -07:00
telephony: remove CVS keywords
2008-10-16 11:21:45 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2008-10-13 14:12:40 -07:00
fbcon_set_all_vcs: fix kernel crash when switching the rotated consoles
2008-10-16 11:21:45 -07:00
W1: w1_int.c use first available master number
2008-10-16 11:21:50 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
2008-10-12 11:51:32 -07:00
af00a2d5a0