Hans-Christian Egtvedt
5aa0769d08
atmel_pwm: set up only one PWM clock when allocating a clock ...
This patch will only setup one clock, if free, and return this clock to the
caller. The previous solution would setup both clocks with the same prescaler
and divider and return PWM_CPR_CLKB, thus taking both clocks in the same call
without the caller knowing.
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-24 10:47:25 -07:00
pm: acpi pm: add DMI quirk list for ACPI 1.0 suspend ordering
2008-07-24 10:47:24 -07:00
Merge commit 'origin/master'
2008-07-16 11:07:59 +10:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2008-07-18 02:39:39 -07:00
memory-hotplug: add sysfs removable attribute for hotplug memory remove
2008-07-24 10:47:21 -07:00
device create: block: convert device_create to device_create_drvdata
2008-07-21 21:54:41 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2008-07-20 17:43:29 -07:00
PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures
2008-07-24 10:47:21 -07:00
Fix printk format warning in clocksource/acpi_pm.c
2008-07-15 11:01:39 -07:00
Merge branch 'cpus4096-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2008-07-23 18:37:44 -07:00
sysdev: Pass the attribute to the low level sysdev show/store function
2008-07-21 21:55:02 -07:00
crypto: ixp4xx - Select CRYPTO_AUTHENC
2008-07-13 20:12:11 +08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
2008-07-23 12:03:18 -07:00
dio: use dio_match_device() in dio_bus_match()
2008-07-20 17:24:40 -07:00
I/OAT: I/OAT version 3.0 support
2008-07-22 17:30:57 -07:00
powerpc/cell/edac: Log a syndrome code in case of correctable error
2008-07-22 10:39:36 +10:00
driver core: remove DEVICE_NAME_SIZE define
2008-07-21 21:54:53 -07:00
Merge branch 'sbp2-spindown' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
2008-07-15 12:39:44 -07:00
cpumask: Replace cpumask_of_cpu with cpumask_of_cpu_ptr
2008-07-18 22:02:57 +02:00
gpio: pcf857x: add lock and handle more chips
2008-07-22 09:59:41 -07:00
drm/radeon: fixup issue with radeon and PAT support.
2008-07-15 15:48:05 +10:00
Merge branches 'upstream' and 'upstream-fixes' into for-linus
2008-07-23 15:26:10 +02:00
device create: hwmon: convert device_create to device_create_drvdata
2008-07-21 21:54:42 -07:00
Driver Core: add ability for class_for_each_device to start in middle of list
2008-07-21 21:54:47 -07:00
ide: small whitespace fixes
2008-07-23 19:56:02 +02:00
PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures
2008-07-24 10:47:21 -07:00
Merge branch 'cpus4096-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2008-07-23 18:37:44 -07:00
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2008-07-23 18:24:08 -07:00
gigaset: gigaset_isowbuf_getbytes() may return signed unnoticed
2008-07-24 10:47:22 -07:00
Merge branch 'generic-ipi' into generic-ipi-for-linus
2008-07-15 21:55:59 +02:00
device create: macintosh: convert device_create to device_create_drvdata
2008-07-21 21:54:43 -07:00
driver core: remove DEVICE_NAME_SIZE define
2008-07-21 21:54:53 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm
2008-07-21 10:30:10 -07:00
PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures
2008-07-24 10:47:21 -07:00
driver core: remove DEVICE_ID_SIZE define
2008-07-21 21:54:53 -07:00
driver core: remove KOBJ_NAME_LEN define
2008-07-21 21:54:52 -07:00
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2008-07-23 18:24:08 -07:00
atmel_pwm: set up only one PWM clock when allocating a clock
2008-07-24 10:47:25 -07:00
sdhci: highmem capable PIO routines
2008-07-23 14:42:09 +02:00
PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures
2008-07-24 10:47:21 -07:00
PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures
2008-07-24 10:47:21 -07:00
OpenFirmware: Include <linux/of_i2c.h> from of_i2c.c.
2008-07-12 12:10:52 -06:00
driver core: remove KOBJ_NAME_LEN define
2008-07-21 21:54:52 -07:00
PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures
2008-07-24 10:47:21 -07:00
PNPACPI: add support for HP vendor-specific CCSR descriptors
2008-07-16 23:27:07 +02:00
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2008-07-23 18:24:08 -07:00
rapidio: fix device reference counting
2008-07-10 18:04:43 -07:00
Driver Core: add ability for class_find_device to start in middle of list
2008-07-21 21:54:47 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2008-07-22 19:09:51 -07:00
sparc64: fix up bus_id changes in sparc core code
2008-07-21 21:55:03 -07:00
PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures
2008-07-24 10:47:21 -07:00
remove the v850 port
2008-07-24 10:47:24 -07:00
Driver Core: add ability for class_find_device to start in middle of list
2008-07-21 21:54:47 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-07-08 16:30:17 -07:00
UIO: add generic UIO platform driver
2008-07-21 21:54:55 -07:00
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2008-07-23 18:24:08 -07:00
PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures
2008-07-24 10:47:21 -07:00
w1/ds2482: Convert to a new-style driver
2008-07-16 19:30:07 +02:00
remove the v850 port
2008-07-24 10:47:24 -07:00
sysdev: Pass the attribute to the low level sysdev show/store function
2008-07-21 21:55:02 -07:00
move memory_read_from_buffer() from fs.h to string.h
2008-07-24 10:47:13 -07:00
gpu: re-order GPU subdirectory vs char for AGP vs DRM startup.
2008-07-21 08:42:49 +10:00
5aa0769d08