History log of /openbmc/linux/drivers/char/nwflash.c (Results 201 – 225 of 293)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
Revision tags: v2.6.33-rc8
# 84abd88a 10-Feb-2010 H. Peter Anvin <hpa@zytor.com>

Merge remote branch 'linus/master' into x86/bootmem


# 9ab99d5a 10-Feb-2010 Patrick McHardy <kaber@trash.net>

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

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


Revision tags: v2.6.33-rc7
# e1a0bdd8 02-Feb-2010 Jiri Kosina <jkosina@suse.cz>

Merge branch 'master' into upstream

Conflicts:
drivers/hid/hid-ids.h


Revision tags: v2.6.33-rc6
# 0ada0a73 28-Jan-2010 Grant Likely <grant.likely@secretlab.ca>

Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree


# 51c24aaa 23-Jan-2010 David S. Miller <davem@davemloft.net>

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


# 6be32571 23-Jan-2010 David S. Miller <davem@davemloft.net>

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


# 7755726f 22-Jan-2010 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge commit 'v2.6.33-rc5' into next


Revision tags: v2.6.33-rc5
# 2457552d 17-Jan-2010 James Morris <jmorris@namei.org>

Merge branch 'master' into next


# 61405fea 13-Jan-2010 Ingo Molnar <mingo@elte.hu>

Merge branch 'perf/urgent' into perf/core

Merge reason: queue up dependent patch, update to -rc4

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


Revision tags: v2.6.33-rc4
# 163849ea 12-Jan-2010 Mark Brown <broonie@opensource.wolfsonmicro.com>

Merge branch 'for-2.6.33' into for-2.6.34


# 1cb4f624 08-Jan-2010 Jaroslav Kysela <perex@perex.cz>

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


# a4ad68d5 08-Jan-2010 Jaroslav Kysela <perex@perex.cz>

Merge branch 'topic/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into devel


# fa94ddea 06-Jan-2010 Paul Mundt <lethal@linux-sh.org>

Merge branch 'master' into sh/hw-breakpoints


Revision tags: v2.6.33-rc3
# 32032df6 04-Jan-2010 Tejun Heo <tj@kernel.org>

Merge branch 'master' into percpu

Conflicts:
arch/powerpc/platforms/pseries/hvCall.S
include/linux/percpu.h


# 5958eed7 04-Jan-2010 David S. Miller <davem@davemloft.net>

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


# 921a2208 04-Jan-2010 Paul Mundt <lethal@linux-sh.org>

Merge branch 'sh/stable-updates'


# 7f50548a 26-Dec-2009 Mark Brown <broonie@opensource.wolfsonmicro.com>

Merge commit 'v2.6.33-rc2' into for-2.6.33


# 15e7f8b9 25-Dec-2009 Takashi Iwai <tiwai@suse.de>

Merge branch 'fix/hda' into topic/hda


# 52e04ea8 25-Dec-2009 Takashi Iwai <tiwai@suse.de>

Merge branch 'fix/misc' into topic/misc


Revision tags: v2.6.33-rc2
# 756fe285 24-Dec-2009 Linus Torvalds <torvalds@linux-foundation.org>

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
VIDEO: cyberpro: pci_request_regions needs a persistent name
ARM

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
VIDEO: cyberpro: pci_request_regions needs a persistent name
ARM: dma-isa: request cascade channel after registering it
ARM: footbridge: trim down old ISA rtc setup
ARM: fix PAGE_KERNEL
ARM: Fix wrong shared bit for CPU write buffer bug test
ARM: 5857/1: ARM: dmabounce: fix build
ARM: 5856/1: Fix bug of uart0 platfrom data for nuc900
ARM: 5855/1: putc support for nuc900
ARM: 5854/1: fix compiling error for NUC900
ARM: 5849/1: ARMv7: fix Oprofile events count
ARM: add missing include to nwflash.c
ARM: Kill CONFIG_CPU_32
ARM: Convert VFP/Crunch/XscaleCP thread_release() to exit_thread()
ARM: 5853/1: ARM: Fix build break on ARM v6 and v7

show more ...


# cdd90fb5 19-Dec-2009 Russell King <rmk+kernel@arm.linux.org.uk>

ARM: add missing include to nwflash.c

nwflash needs jiffie definitions.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>


Revision tags: 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
# 5a2dd72a 16-Jan-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into irq/genirq


# e3ee1e12 12-Jan-2009 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.29-rc1' into timers/hrtimers

Conflicts:
kernel/time/tick-common.c


# 506c10f2 10-Jan-2009 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.29-rc1' into perfcounters/core

Conflicts:
include/linux/kernel_stat.h


Revision tags: v2.6.29-rc1
# b2576e1d 09-Jan-2009 Len Brown <len.brown@intel.com>

Merge branch 'linus' into release


12345678910>>...12