History log of /linux/Documentation/ABI/testing/sysfs-bus-usb (Results 476 – 500 of 598)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# cf9b59e9 22-May-2010 Grant Likely <grant.likely@secretlab.ca>

Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
drivers/i2c/bus

Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
drivers/i2c/busses/i2c-cpm.c
drivers/i2c/busses/i2c-mpc.c
drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

show more ...


# 19fdb9ee 22-May-2010 NeilBrown <neilb@suse.de>

Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus

Conflicts:
drivers/md/md.c

- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.

Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus

Conflicts:
drivers/md/md.c

- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.

Signed-off-by: NeilBrown <neilb@suse.de>

show more ...


# ee9a3607 21-May-2010 Jens Axboe <jens.axboe@oracle.com>

Merge branch 'master' into for-2.6.35

Conflicts:
fs/ext3/fsync.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>


# 7a9b1492 21-May-2010 Linus Torvalds <torvalds@linux-foundation.org>

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits)
USB: remove unused usb_buffer_alloc and usb_buffer_

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits)
USB: remove unused usb_buffer_alloc and usb_buffer_free macros
usb: musb: update gfp/slab.h includes
USB: ftdi_sio: fix legacy SIO-device header
USB: kl5usb105: reimplement using generic framework
USB: kl5usb105: minor clean ups
USB: kl5usb105: fix memory leak
USB: io_ti: use kfifo to implement write buffering
USB: io_ti: remove unsused private counter
USB: ti_usb: use kfifo to implement write buffering
USB: ir-usb: fix incorrect write-buffer length
USB: aircable: fix incorrect write-buffer length
USB: safe_serial: straighten out read processing
USB: safe_serial: reimplement read using generic framework
USB: safe_serial: reimplement write using generic framework
usb-storage: always print quirks
USB: usb-storage: trivial debug improvements
USB: oti6858: use port write fifo
USB: oti6858: use kfifo to implement write buffering
USB: cypress_m8: use kfifo to implement write buffering
USB: cypress_m8: remove unused drain define
...

Fix up conflicts (due to usb_buffer_alloc/free renaming) in
drivers/input/tablet/acecad.c
drivers/input/tablet/kbtab.c
drivers/input/tablet/wacom_sys.c
drivers/media/video/gspca/gspca.c
sound/usb/usbaudio.c

show more ...


Revision tags: v2.6.34, v2.6.34-rc7, v2.6.34-rc6, v2.6.34-rc5, v2.6.34-rc4
# a9030986 02-Apr-2010 Alan Stern <stern@rowland.harvard.edu>

USB: deprecate the power/level sysfs attribute

This patch (as1367) deprecates USB's power/level sysfs attribute in
favor of the power/control attribute provided by the runtime PM core.
The two attri

USB: deprecate the power/level sysfs attribute

This patch (as1367) deprecates USB's power/level sysfs attribute in
favor of the power/control attribute provided by the runtime PM core.
The two attributes do the same thing.

It would be nice to replace power/level with a symlink to
power/control, but at the moment sysfs doesn't offer any way to do so.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

show more ...


# ac1d426e 17-May-2010 Russell King <rmk+kernel@arm.linux.org.uk>

Merge branch 'devel-stable' into devel

Conflicts:
arch/arm/Kconfig
arch/arm/include/asm/system.h
arch/arm/mm/Kconfig


# b65b3489 17-May-2010 Henrique de Moraes Holschuh <hmh@hmh.eng.br>

Merge mainline (v2.6.34-rc7)


# a9aa1d02 12-May-2010 Frederic Weisbecker <fweisbec@gmail.com>

Merge commit 'v2.6.34-rc7' into perf/nmi

Merge reason: catch up with latest softlockup detector changes.


# dbb6be6d 10-May-2010 Thomas Gleixner <tglx@linutronix.de>

Merge branch 'linus' into timers/core

Reason: Further posix_cpu_timer patches depend on mainline changes

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>


# 5306293c 04-May-2010 J. Bruce Fields <bfields@citi.umich.edu>

Merge commit 'v2.6.34-rc6'

Conflicts:
fs/nfsd/nfs4callback.c


# d6d53cbc 03-May-2010 Jiri Kosina <jkosina@suse.cz>

Merge branch 'hid-suspend' into picolcd


# 53ba4f2f 03-May-2010 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.34-rc6' into core/locking


# df2071bd 03-May-2010 Herbert Xu <herbert@gondor.apana.org.au>

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6


# 868c522b 30-Apr-2010 Frederic Weisbecker <fweisbec@gmail.com>

Merge commit 'v2.6.34-rc6' into core/locking

Merge reason: Further lockdep patches depend on per cpu updates
made in -rc1.


# d9c5841e 30-Apr-2010 H. Peter Anvin <hpa@zytor.com>

Merge branch 'x86/asm' into x86/atomic

Merge reason:
Conflict between LOCK_PREFIX_HERE and relative alternatives
pointers

Resolved Conflicts:
arch/x86/include/asm/alternative.h
arch/x86/kernel/

Merge branch 'x86/asm' into x86/atomic

Merge reason:
Conflict between LOCK_PREFIX_HERE and relative alternatives
pointers

Resolved Conflicts:
arch/x86/include/asm/alternative.h
arch/x86/kernel/alternative.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

show more ...


# a36bf32e 23-Apr-2010 Robert Richter <robert.richter@amd.com>

Merge commit 'v2.6.34-rc5' into oprofile/core


# 6c9468e9 23-Apr-2010 Jiri Kosina <jkosina@suse.cz>

Merge branch 'master' into for-next


# 62910554 20-Apr-2010 Patrick McHardy <kaber@trash.net>

Merge branch 'master' of /repos/git/net-next-2.6

Conflicts:
Documentation/feature-removal-schedule.txt
net/ipv6/netfilter/ip6t_REJECT.c
net/netfilter/xt_limit.c

Signed-off-by: Patrick McHardy <k

Merge branch 'master' of /repos/git/net-next-2.6

Conflicts:
Documentation/feature-removal-schedule.txt
net/ipv6/netfilter/ip6t_REJECT.c
net/netfilter/xt_limit.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

show more ...


# 87d8a697 09-Apr-2010 David Woodhouse <David.Woodhouse@intel.com>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6


# 4a35ecf8 07-Apr-2010 David S. Miller <davem@davemloft.net>

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/bonding/bond_main.c
drivers/net/via-velocity.c
drivers/net/wireless/iwlwifi/iwl-agn.c


# 87e8b821 04-Apr-2010 David S. Miller <davem@davemloft.net>

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/


# c9494727 02-Apr-2010 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into sched/core

Merge reason: update to latest upstream

Signed-off-by: Ingo Molnar <mingo@elte.hu>


# 3595be77 31-Mar-2010 Dave Airlie <airlied@redhat.com>

Merge branch 'v2.6.34-rc2' into drm-linus


# d25d6fa1 30-Mar-2010 James Morris <jmorris@namei.org>

Merge branch 'master' into next


Revision tags: v2.6.34-rc3
# 329f9052 26-Mar-2010 David Woodhouse <David.Woodhouse@intel.com>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
drivers/mtd/nand/sh_flctl.c

Maxim's patch to initialise sysfs attributes depends on the patch w

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
drivers/mtd/nand/sh_flctl.c

Maxim's patch to initialise sysfs attributes depends on the patch which
actually adds sysfs_attr_init().

show more ...


1...<<11121314151617181920>>...24