History log of /linux/Documentation/ABI/testing/sysfs-bus-css (Results 76 – 100 of 109)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# ba67cf5c 02-May-2011 Tejun Heo <tj@kernel.org>

Merge branch 'x86/urgent' into x86-mm

Merge reason: Pick up the following two fix commits.

2be19102b7: x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo()
765af22da8: x86-32, NUMA:

Merge branch 'x86/urgent' into x86-mm

Merge reason: Pick up the following two fix commits.

2be19102b7: x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo()
765af22da8: x86-32, NUMA: Fix ACPI NUMA init broken by recent x86-64 change

Scheduled NUMA init 32/64bit unification changes depend on these.

Signed-off-by: Tejun Heo <tj@kernel.org>

show more ...


# a3ea8e8f 02-May-2011 Takashi Iwai <tiwai@suse.de>

Merge branch 'fix/hda' into topic/hda


# 07f9479a 26-Apr-2011 Jiri Kosina <jkosina@suse.cz>

Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.


# 68d2cf25 19-Apr-2011 Ingo Molnar <mingo@elte.hu>

Merge branch 'perf/urgent' into perf/core

Merge reason: we'll be queueing up dependent changes.

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


Revision tags: v2.6.39-rc4
# d5381e42 18-Apr-2011 Mark Brown <broonie@opensource.wolfsonmicro.com>

ASoC: Merge branch 'for-2.6.39' into for-2.6.40

Fix trivial conflict caused by silly spelling fix patch.

Conflicts:
sound/soc/codecs/wm8994.c


# fac56c2d 18-Apr-2011 Mark Brown <broonie@opensource.wolfsonmicro.com>

Merge commit 'v2.6.39-rc3' into for-2.6.39


# a84bd2ee 14-Apr-2011 Russell King <rmk+kernel@arm.linux.org.uk>

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes


# 32235b07 13-Apr-2011 Greg Kroah-Hartman <gregkh@suse.de>

Staging: merge 2.6.39-rc3 into staging-next

This was done to handle a number of conflicts, the majority of which
were caused by the big "fix spelling issues" patch.

Signed-off-by: Greg Kroah-Hartma

Staging: merge 2.6.39-rc3 into staging-next

This was done to handle a number of conflicts, the majority of which
were caused by the big "fix spelling issues" patch.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

show more ...


Revision tags: v2.6.39-rc3
# 1c01a80c 11-Apr-2011 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/smsc911x.c


# 42933bac 07-Apr-2011 Linus Torvalds <torvalds@linux-foundation.org>

Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings


Revision tags: v2.6.39-rc2
# 25985edc 31-Mar-2011 Lucas De Marchi <lucas.demarchi@profusion.mobi>

Fix common misspellings

Fixes generated by 'codespell' and manually reviewed.

Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>


Revision tags: v2.6.39-rc1, v2.6.38, v2.6.38-rc8, v2.6.38-rc7, v2.6.38-rc6, v2.6.38-rc5, v2.6.38-rc4, v2.6.38-rc3, v2.6.38-rc2, v2.6.38-rc1, v2.6.37, v2.6.37-rc8, v2.6.37-rc7, v2.6.37-rc6, v2.6.37-rc5, v2.6.37-rc4, v2.6.37-rc3, v2.6.37-rc2, v2.6.37-rc1, v2.6.36, v2.6.36-rc8, v2.6.36-rc7, v2.6.36-rc6, v2.6.36-rc5, v2.6.36-rc4, v2.6.36-rc3, v2.6.36-rc2, v2.6.36-rc1, v2.6.35, v2.6.35-rc6, v2.6.35-rc5, v2.6.35-rc4, v2.6.35-rc3, v2.6.35-rc2, v2.6.35-rc1, v2.6.34, v2.6.34-rc7, v2.6.34-rc6, v2.6.34-rc5, v2.6.34-rc4, v2.6.34-rc3, v2.6.34-rc2, v2.6.34-rc1, v2.6.33, v2.6.33-rc8, v2.6.33-rc7, v2.6.33-rc6, v2.6.33-rc5, v2.6.33-rc4, v2.6.33-rc3, v2.6.33-rc2, v2.6.33-rc1, v2.6.32, v2.6.32-rc8, v2.6.32-rc7, v2.6.32-rc6, v2.6.32-rc5, v2.6.32-rc4, v2.6.32-rc3, v2.6.32-rc1, v2.6.32-rc2, v2.6.31, v2.6.31-rc9, v2.6.31-rc8, v2.6.31-rc7, v2.6.31-rc6, v2.6.31-rc5, v2.6.31-rc4, v2.6.31-rc3, v2.6.31-rc2, v2.6.31-rc1, v2.6.30, v2.6.30-rc8, v2.6.30-rc7, v2.6.30-rc6, v2.6.30-rc5, v2.6.30-rc4, v2.6.30-rc3, v2.6.30-rc2, v2.6.30-rc1, v2.6.29, v2.6.29-rc8, v2.6.29-rc7, v2.6.29-rc6, v2.6.29-rc5, v2.6.29-rc4, v2.6.29-rc3, v2.6.29-rc2, v2.6.29-rc1, v2.6.28, v2.6.28-rc9, v2.6.28-rc8, v2.6.28-rc7, v2.6.28-rc6, v2.6.28-rc5, v2.6.28-rc4, v2.6.28-rc3, v2.6.28-rc2, v2.6.28-rc1
# b2aaf8f7 15-Oct-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into stackprotector

Conflicts:
arch/x86/kernel/Makefile
include/asm-x86/pda.h


Revision tags: v2.6.27, v2.6.27-rc9, v2.6.27-rc8, v2.6.27-rc7, v2.6.27-rc6, v2.6.27-rc5, v2.6.27-rc4, v2.6.27-rc3, v2.6.27-rc2, v2.6.27-rc1
# 3e370b29 18-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks

Conflicts:

drivers/pci/quirks.c

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


# 85e9ca33 31-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into timers/hpet


# bc588df7 30-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'x86/core' into x86/xsave


# 9fec6060 30-Jul-2008 Anton Vorontsov <cbouatmailru@gmail.com>

Merge branch 'master' of /home/cbou/linux-2.6

Conflicts:

drivers/power/Kconfig
drivers/power/Makefile


# ff877ea8 25-Jul-2008 David Woodhouse <David.Woodhouse@intel.com>

Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6


# 0e2f65ee 25-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/pebs

Conflicts:

arch/x86/Kconfig.cpu
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/setup_64.c

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


# 9063974c 23-Jul-2008 Jiri Kosina <jkosina@suse.cz>

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


# 908cf4b9 21-Jul-2008 Dmitry Torokhov <dmitry.torokhov@gmail.com>

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


# a208f37a 18-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/x2apic


# 0679c2f4 18-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into pci-for-jesse


# f6dc8cca 18-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into core/generic-dma-coherent

Conflicts:

kernel/Makefile

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


# 9b610fda 18-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into timers/nohz


# f1b0c8d3 18-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/amd-iommu


12345