Dan Williams
d9ca676bcb
atm: correct sysfs 'device' link creation and parent relationships ...
The ATM subsystem was incorrectly creating the 'device' link for ATM
nodes in sysfs. This led to incorrect device/parent relationships
exposed by sysfs and udev. Instead of rolling the 'device' link by hand
in the generic ATM code, pass each ATM driver's bus device down to the
sysfs code and let sysfs do this stuff correctly.
Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-12-10 15:45:05 -08:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2010-10-26 17:28:37 -07:00
drivers/ata/pata_octeon_cf.c: delete double assignment
2010-11-12 17:10:55 -05:00
atm: correct sysfs 'device' link creation and parent relationships
2010-12-10 15:45:05 -08:00
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
2010-10-29 15:09:56 -07:00
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
2010-11-12 08:52:47 -08:00
Bluetooth: Add new PID for Atheros 3011
2010-12-01 15:51:01 -02:00
cdrom: gdrom: ctrl_in/outX to __raw_read/writeX conversion.
2010-10-27 14:33:39 +09:00
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2010-11-12 16:02:30 -08:00
ARM: shmobile: remove sh_timer_config clk member
2010-10-31 10:40:39 -04:00
connector: add module alias
2010-12-10 12:27:49 -08:00
[CPUFREQ] add sampling_down_factor tunable to improve ondemand performance
2010-10-22 11:44:47 -04:00
replace nested max/min macros with {max,min}3 macro
2010-10-26 16:52:12 -07:00
drivers/dma/Kconfig: add part number for Topcliff.
2010-10-29 14:14:02 -07:00
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core
2010-10-26 10:13:48 -07:00
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
2010-11-05 14:17:22 -07:00
dmi: log board, system, and BIOS information
2010-10-27 18:03:05 -07:00
gpio: Add VIA VX855 GPIO driver
2010-10-29 00:29:51 +02:00
drm/ttm: Be consistent on ttm_bo_init() failures
2010-11-10 11:52:19 +10:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2010-10-25 07:59:01 -07:00
hwmon: (gpio-fan) Fix fan_ctrl_init error path
2010-11-11 09:43:51 -08:00
i2c-i801: Add PCI idents for Patsburg 'IDF' SMBus controllers
2010-10-31 21:07:00 +01:00
ide: clean up timed out request handling
2010-10-26 10:17:30 -07:00
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
2010-10-26 17:28:07 -07:00
convert get_sb_single() users
2010-10-29 04:16:28 -04:00
Input: do not pass injected events back to the originating handler
2010-11-11 01:01:26 -08:00
isdn: icn: Fix stack corruption bug.
2010-11-24 11:19:05 -08:00
drivers/leds/leds-gpio.c: properly initialize return value
2010-11-12 07:55:32 -08:00
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
drivers/macintosh/adb-iop.c: flags should be unsigned long
2010-11-12 07:55:30 -08:00
block: read i_size with i_size_read()
2010-11-10 14:40:53 +01:00
Input: ir-keytable - fix uninitialized variable warning
2010-10-31 21:05:43 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2010-10-22 17:34:15 -07:00
mfd: Fix a memory leak when unload mc13xxx-core module
2010-10-29 00:30:43 +02:00
drivers/misc/bh1770glc.c: error handling in bh1770_power_state_store()
2010-11-12 07:55:31 -08:00
mfd: Adding twl6030 mmc card detect support for MMC1
2010-10-29 00:29:59 +02:00
Merge git://git.infradead.org/mtd-2.6
2010-10-30 08:31:35 -07:00
enic: Bug Fix: Pass napi reference to the isr that services receive queue
2010-12-10 15:01:07 -08:00
of/mips: Cleanup some include directives/files.
2010-10-21 11:10:11 -06:00
Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-10-30 11:43:26 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
2010-10-28 09:24:14 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
xen-pcifront: fix PCI reference leak
2010-11-08 11:41:15 -05:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
Remove duplicate includes from many files
2010-10-27 18:03:18 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2010-10-26 17:28:37 -07:00
power: Revert "power_supply: Mark twl4030_charger as broken"
2010-10-29 00:30:44 +02:00
rapidio: use resource_size()
2010-11-12 07:55:30 -08:00
regulator: max8998 BUCK1/2 voltage change with use of GPIOs
2010-10-29 00:30:15 +02:00
sh: mach-snapgear: Kill off machtype, consolidate board def.
2010-10-29 19:06:53 +09:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2010-11-12 17:17:55 -08:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-10-25 08:19:14 -07:00
block: remove REQ_HARDBARRIER
2010-11-10 14:54:09 +01:00
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2010-11-12 16:02:30 -08:00
Merge branches 'sh/pio-death', 'sh/nommu', 'sh/clkfwk', 'sh/core' and 'sh/intc-extension' into sh-fixes-for-linus
2010-11-08 09:42:43 +09:00
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
2010-11-01 07:50:43 -04:00
ssb: b43-pci-bridge: Add new vendor for BCM4318
2010-11-22 15:19:31 -05:00
Staging: Merge 'tidspbridge-2.6.37-rc1' into staging-linus
2010-11-11 05:14:54 -08:00
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:56 -07:00
n_gsm: Fix length handling
2010-11-11 11:06:09 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
atm: correct sysfs 'device' link creation and parent relationships
2010-12-10 15:45:05 -08:00
UWB: Return UWB_RSV_ALLOC_NOT_FOUND rather than crashing on NULL dereference if kzalloc fails
2010-11-11 07:14:07 -08:00
vhost/net: fix rcu check usage
2010-11-25 11:29:16 +02:00
backlight: MacBookAir3,1(3,2) mbp-nvidia-bl support
2010-11-12 07:55:33 -08:00
w1: don't allow arbitrary users to remove w1 devices
2010-10-27 18:03:17 -07:00
WATCHDOG: octeon-wdt: Use I/O clock rate for timing calculations.
2010-10-29 19:08:42 +01:00
Merge branch 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
2010-11-12 16:01:55 -08:00
zorro: Fix device_register() error handling
2010-10-22 09:43:25 +02:00
TTY: create drivers/tty and move the tty core files there
2010-11-05 08:10:33 -07:00
d9ca676bcb