History log of /linux/fs/9p/Makefile (Results 76 – 100 of 176)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
Revision tags: v2.6.38-rc2
# 14f0290b 19-Jan-2011 Patrick McHardy <kaber@trash.net>

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


# a1926d17 19-Jan-2011 Mark Brown <broonie@opensource.wolfsonmicro.com>

Merge branch 'for-2.6.38' into for-2.6.39


Revision tags: v2.6.38-rc1
# f652f6c5 16-Jan-2011 Nicholas Bellinger <nab@linux-iscsi.org>

Merge branch 'master' of /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 into for-linus


# 42a9fa99 14-Jan-2011 Grant Likely <grant.likely@secretlab.ca>

Merge branch 'devicetree/next' into spi/next


# f43dc23d 13-Jan-2011 Paul Mundt <lethal@linux-sh.org>

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

Conflicts:
arch/sh/kernel/cpu/sh2/setup-sh7619.c
arch/sh/kernel/cpu/sh2a/setup-mxg

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

Conflicts:
arch/sh/kernel/cpu/sh2/setup-sh7619.c
arch/sh/kernel/cpu/sh2a/setup-mxg.c
arch/sh/kernel/cpu/sh2a/setup-sh7201.c
arch/sh/kernel/cpu/sh2a/setup-sh7203.c
arch/sh/kernel/cpu/sh2a/setup-sh7206.c
arch/sh/kernel/cpu/sh3/setup-sh7705.c
arch/sh/kernel/cpu/sh3/setup-sh770x.c
arch/sh/kernel/cpu/sh3/setup-sh7710.c
arch/sh/kernel/cpu/sh3/setup-sh7720.c
arch/sh/kernel/cpu/sh4/setup-sh4-202.c
arch/sh/kernel/cpu/sh4/setup-sh7750.c
arch/sh/kernel/cpu/sh4/setup-sh7760.c
arch/sh/kernel/cpu/sh4a/setup-sh7343.c
arch/sh/kernel/cpu/sh4a/setup-sh7366.c
arch/sh/kernel/cpu/sh4a/setup-sh7722.c
arch/sh/kernel/cpu/sh4a/setup-sh7723.c
arch/sh/kernel/cpu/sh4a/setup-sh7724.c
arch/sh/kernel/cpu/sh4a/setup-sh7763.c
arch/sh/kernel/cpu/sh4a/setup-sh7770.c
arch/sh/kernel/cpu/sh4a/setup-sh7780.c
arch/sh/kernel/cpu/sh4a/setup-sh7785.c
arch/sh/kernel/cpu/sh4a/setup-sh7786.c
arch/sh/kernel/cpu/sh4a/setup-shx3.c
arch/sh/kernel/cpu/sh5/setup-sh5.c
drivers/serial/sh-sci.c
drivers/serial/sh-sci.h
include/linux/serial_sci.h

show more ...


# 56dbed12 13-Jan-2011 Len Brown <len.brown@intel.com>

Merge branch 'linus' into idle-test


# 53582c4c 12-Jan-2011 Paul Mundt <lethal@linux-sh.org>

Merge branch 'rmobile/sdio' into rmobile-latest


# 83eb95b8 12-Jan-2011 Paul Mundt <lethal@linux-sh.org>

Merge branch 'sh/sdio' into sh-latest


# 0945f352 11-Jan-2011 Linus Torvalds <torvalds@linux-foundation.org>

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
fs/9p: Don't set dentry->d_op in c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
fs/9p: Don't set dentry->d_op in create routines
fs/9p: fix spelling typo
fs/9p: TREADLINK bugfix
net/9p: Use proper data types
fs/9p: Simplify the .L create operation
fs/9p: Move dotl inode operations into a seperate file
fs/9p: fix menu presentation
fs/9p: Fix the return error on default acl removal
fs/9p: Remove unnecessary semicolons

show more ...


# 53c06f4e 10-Jan-2011 Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

fs/9p: Move dotl inode operations into a seperate file

Source Code Reorganization

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Venkateswararao Jujjuri <jvrao@lin

fs/9p: Move dotl inode operations into a seperate file

Source Code Reorganization

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

show more ...


Revision tags: v2.6.37
# bc030d6c 04-Jan-2011 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.37-rc8' into x86/apic

Conflicts:
arch/x86/include/asm/io_apic.h

Merge reason: move to a fresh -rc, resolve the conflict.

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


# d392da52 30-Dec-2010 Grant Likely <grant.likely@secretlab.ca>

Merge v2.6.37-rc8 into powerpc/next


Revision tags: v2.6.37-rc8, v2.6.37-rc7, v2.6.37-rc6
# 8990c1bc 14-Dec-2010 Michal Marek <mmarek@suse.cz>

Merge commit 'v2.6.37-rc1' into kbuild/kbuild


# 2ade0c1d 10-Dec-2010 Jiri Kosina <jkosina@suse.cz>

Merge branch 'master' into upstream


# d834a9dc 09-Dec-2010 Thomas Gleixner <tglx@linutronix.de>

Merge branch 'x86/amd-nb' into x86/apic-cleanups

Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform

Conflicts:
arch/x86/include/asm/io_apic.h

Signed-off-by: Thomas Gleixner

Merge branch 'x86/amd-nb' into x86/apic-cleanups

Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform

Conflicts:
arch/x86/include/asm/io_apic.h

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

show more ...


Revision tags: v2.6.37-rc5, v2.6.37-rc4, v2.6.37-rc3
# 92fd4d4d 18-Nov-2010 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.37-rc2' into sched/core

Merge reason: Move to a .37-rc base.

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


# 20b4755e 16-Nov-2010 Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

Merge commit 'v2.6.37-rc2' into upstream/xenfs

* commit 'v2.6.37-rc2': (10093 commits)
Linux 2.6.37-rc2
capabilities/syslog: open code cap_syslog logic to fix build failure
i2c: Sanity checks

Merge commit 'v2.6.37-rc2' into upstream/xenfs

* commit 'v2.6.37-rc2': (10093 commits)
Linux 2.6.37-rc2
capabilities/syslog: open code cap_syslog logic to fix build failure
i2c: Sanity checks on adapter registration
i2c: Mark i2c_adapter.id as deprecated
i2c: Drivers shouldn't include <linux/i2c-id.h>
i2c: Delete unused adapter IDs
i2c: Remove obsolete cleanup for clientdata
include/linux/kernel.h: Move logging bits to include/linux/printk.h
Fix gcc 4.5.1 miscompiling drivers/char/i8k.c (again)
hwmon: (w83795) Check for BEEP pin availability
hwmon: (w83795) Clear intrusion alarm immediately
hwmon: (w83795) Read the intrusion state properly
hwmon: (w83795) Print the actual temperature channels as sources
hwmon: (w83795) List all usable temperature sources
hwmon: (w83795) Expose fan control method
hwmon: (w83795) Fix fan control mode attributes
hwmon: (lm95241) Check validity of input values
hwmon: Change mail address of Hans J. Koch
PCI: sysfs: fix printk warnings
GFS2: Fix inode deallocation race
...

show more ...


# a0205634 16-Nov-2010 Jens Axboe <jaxboe@fusionio.com>

Merge branch 'v2.6.37-rc2' into for-2.6.38/core


Revision tags: v2.6.37-rc2
# c94f28c3 15-Nov-2010 Chris Wilson <chris@chris-wilson.co.uk>

Merge branch 'drm-intel-fixes' into drm-intel-next

Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_ringbuffer.c


# 1bb95834 15-Nov-2010 Chris Wilson <chris@chris-wilson.co.uk>

Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes


# 69dbdd81 03-Nov-2010 Takashi Iwai <tiwai@suse.de>

Merge branch 'fix/asoc' into for-linus


# 0a27f050 03-Nov-2010 Liam Girdwood <lrg@slimlogic.co.uk>

Merge commit 'v2.6.37-rc1' into for-2.6.38


# 8f987768 03-Nov-2010 Liam Girdwood <lrg@slimlogic.co.uk>

Merge commit 'v2.6.37-rc1' into for-2.6.37


# 9e3be1ed 02-Nov-2010 Mark Brown <broonie@opensource.wolfsonmicro.com>

Merge branch 'for-2.6.37' into HEAD

WARN() fix from Joe moved.

Conflicts:
sound/soc/codecs/wm_hubs.c


# 29c798fe 02-Nov-2010 Mark Brown <broonie@opensource.wolfsonmicro.com>

Merge commit 'v2.6.37-rc1' into for-2.6.37


12345678