History log of /openbmc/linux/fs/squashfs/zlib_wrapper.c (Results 201 – 225 of 270)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 19fdb9ee 21-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 ...


# ffee72d4 19-May-2010 Paul Mundt <lethal@linux-sh.org>

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


# 8d0bc2b4 19-May-2010 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge commit 'v2.6.34' into next


# 05ea893c 18-May-2010 Dave Airlie <airlied@redhat.com>

Merge remote branch 'anholt/drm-intel-next' into drm-next

* anholt/drm-intel-next: (515 commits)
drm/i915: Fix out of tree builds
drm/i915: move fence lru to struct drm_i915_fence_reg
drm/i915

Merge remote branch 'anholt/drm-intel-next' into drm-next

* anholt/drm-intel-next: (515 commits)
drm/i915: Fix out of tree builds
drm/i915: move fence lru to struct drm_i915_fence_reg
drm/i915: don't allow tiling changes on pinned buffers v2
drm/i915: Be extra careful about A/D matching for multifunction SDVO
drm/i915: Fix DDC bus selection for multifunction SDVO
drm/i915: cleanup mode setting before unmapping registers
drm/i915: Make fbc control wrapper functions
drm/i915: Wait for the GPU whilst shrinking, if truly desperate.
drm/i915: Use spatio-temporal dithering on PCH
[MTD] Remove zero-length files mtdbdi.c and internal.ho
pata_pcmcia / ide-cs: Fix bad hashes for Transcend and kingston IDs
libata: Fix several inaccuracies in developer's guide
slub: Fix bad boundary check in init_kmem_cache_nodes()
raid6: fix recovery performance regression
KEYS: call_sbin_request_key() must write lock keyrings before modifying them
KEYS: Use RCU dereference wrappers in keyring key type code
KEYS: find_keyring_by_name() can gain access to a freed keyring
ALSA: hda: Fix 0 dB for Packard Bell models using Conexant CX20549 (Venice)
ALSA: hda - Add quirk for Dell Inspiron 19T using a Conexant CX20582
ALSA: take tu->qlock with irqs disabled
...

show more ...


# 0b28330e 17-May-2010 Dan Williams <dan.j.williams@intel.com>

Merge branch 'ioat' into dmaengine


# 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 16-May-2010 Henrique de Moraes Holschuh <hmh@hmh.eng.br>

Merge mainline (v2.6.34-rc7)


Revision tags: v2.6.34
# 23e117fa 14-May-2010 Steven Rostedt <srostedt@redhat.com>

Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-4


# baa45633 13-May-2010 Steve French <sfrench@us.ibm.com>

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

Conflicts:
fs/cifs/inode.c


# ad56b079 13-May-2010 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.34-rc7' into tracing/core

Merge reason: Update from -rc5 to -rc7.

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


# 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.


# 278554bd 12-May-2010 David S. Miller <davem@davemloft.net>

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

Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ar9170/usb.c
drivers/scsi/iscsi_t

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

Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ar9170/usb.c
drivers/scsi/iscsi_tcp.c
net/ipv4/ipmr.c

show more ...


Revision tags: v2.6.34-rc7
# 34dc4d44 07-May-2010 Eric Anholt <eric@anholt.net>

Merge remote branch 'origin/master' into drm-intel-next

Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/radeon/r300.c

The BSD ringbuffer support that i

Merge remote branch 'origin/master' into drm-intel-next

Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/radeon/r300.c

The BSD ringbuffer support that is landing in this branch
significantly conflicts with the Ironlake PIPE_CONTROL fix on master,
and requires it to be tested successfully anyway.

show more ...


# 0ae28a35 10-May-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/mtdcore.c

Pull in the bdi fixes and ARM platform changes that other outstanding
pat

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

Conflicts:
drivers/mtd/mtdcore.c

Pull in the bdi fixes and ARM platform changes that other outstanding
patches depend on.

show more ...


# 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>


# 7c224a03 10-May-2010 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.34-rc7' into oprofile

Merge reason: Update to Linus's latest -rc.

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


# d7be0ce6 08-May-2010 H. Peter Anvin <hpa@zytor.com>

Merge commit 'v2.6.34-rc6' into x86/cpu


# 48652ced 07-May-2010 Ingo Molnar <mingo@elte.hu>

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


# 1468cf05 06-May-2010 Len Brown <len.brown@intel.com>

Merge branches 'bugzilla-14337', 'bugzilla-14998', 'bugzilla-15407', 'bugzilla-15903' and 'misc-2.6.34' into release


# 1ed31d6d 06-May-2010 Benjamin Herrenschmidt <benh@kernel.crashing.org>

Merge commit 'origin/master' into next


# 0ffbe269 05-May-2010 James Morris <jmorris@namei.org>

Merge branch 'master' into next


# 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 02-May-2010 Herbert Xu <herbert@gondor.apana.org.au>

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


1234567891011