History log of /linux/.gitignore (Results 976 – 1000 of 1247)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 6548698f 07-Dec-2009 Frederic Weisbecker <fweisbec@gmail.com>

Merge commit 'v2.6.32' into reiserfs/kill-bkl

Merge-reason: The tree was based 2.6.31. It's better to be up to date
with 2.6.32. Although no conflicting changes were made in between,
it gives benchm

Merge commit 'v2.6.32' into reiserfs/kill-bkl

Merge-reason: The tree was based 2.6.31. It's better to be up to date
with 2.6.32. Although no conflicting changes were made in between,
it gives benchmarking results closer to the lastest kernel behaviour.

show more ...


# 64357ed4 06-Dec-2009 Rafael J. Wysocki <rjw@sisk.pl>

Merge branch 'master' into for-linus


# 5cb2faa6 04-Dec-2009 Russell King <rmk+kernel@arm.linux.org.uk>

Merge branch 'pending-misc' (early part) into devel


# a6c872af 03-Dec-2009 David S. Miller <davem@davemloft.net>

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


# 220d0b1d 03-Dec-2009 Jens Axboe <jens.axboe@oracle.com>

Merge branch 'master' into for-2.6.33


# 46783203 03-Dec-2009 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge commit 'v2.6.32' into next


# c84d6efd 03-Dec-2009 James Morris <jmorris@macbook.(none)>

Merge branch 'master' into next


# ff9c38bb 02-Dec-2009 David S. Miller <davem@davemloft.net>

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

Conflicts:
net/mac80211/ht.c


# 7e8f44f8 02-Dec-2009 David S. Miller <davem@davemloft.net>

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


# 83863243 01-Dec-2009 Herbert Xu <herbert@gondor.apana.org.au>

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


# e3a41d7b 24-Nov-2009 Gertjan van Wingerde <gwingerde@gmail.com>

.gitignore: Add bzip2 compressed files

We can have bzip2 compressed images nowadays.

Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundati

.gitignore: Add bzip2 compressed files

We can have bzip2 compressed images nowadays.

Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

show more ...


# 907bc6c7 06-Oct-2009 Mark Brown <broonie@opensource.wolfsonmicro.com>

Merge branch 'for-2.6.32' into for-2.6.33


# f0568783 23-Sep-2009 Anton Vorontsov <avorontsov@ru.mvista.com>

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

Conflicts:
drivers/power/wm97xx_battery.c


# fc8e1ead 14-Sep-2009 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge branch 'next' into for-linus


# cf7a2b4f 12-Sep-2009 Russell King <rmk@dyn-67.arm.linux.org.uk>

Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and 'w90x900' into devel


# 9134d02b 09-Sep-2009 Dan Williams <dan.j.williams@intel.com>

Merge commit 'md/for-linus' into async-tx-next

Conflicts:
drivers/md/raid5.c


# bbb20089 09-Sep-2009 Dan Williams <dan.j.williams@intel.com>

Merge branch 'dmaengine' into async-tx-next

Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c


# a348a7e6 08-Sep-2009 Dan Williams <dan.j.williams@intel.com>

Merge commit 'v2.6.31-rc1' into dmaengine


# a1922ed6 07-Sep-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

Si

Merge branch 'tracing/core' into tracing/hw-breakpoints

Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.

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

show more ...


# b855192c 27-Aug-2009 H. Peter Anvin <hpa@zytor.com>

Merge branch 'x86/urgent' into x86/pat

Reason: Change to is_new_memtype_allowed() in x86/urgent

Resolved semantic conflicts in:

arch/x86/mm/pat.c
arch/x86/mm/ioremap.c

Signed-off-by: H. Peter

Merge branch 'x86/urgent' into x86/pat

Reason: Change to is_new_memtype_allowed() in x86/urgent

Resolved semantic conflicts in:

arch/x86/mm/pat.c
arch/x86/mm/ioremap.c

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

show more ...


# 5f9ece02 24-Aug-2009 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.31-rc7' into x86/cleanups

Merge reason: we were on -rc1 before - go up to -rc7

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


# 8a517c51 23-Aug-2009 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.31-rc7' into x86/cpu


# e9dc1221 21-Aug-2009 J. Bruce Fields <bfields@citi.umich.edu>

Merge branch 'nfs-for-2.6.32' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 into for-2.6.32-incoming

Conflicts:
net/sunrpc/cache.c


# f72222c7 18-Aug-2009 Mark Brown <broonie@opensource.wolfsonmicro.com>

Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into upstream/wm8711


# fa08661a 15-Aug-2009 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.31-rc6' into core/rcu

Merge reason: the branch was on pre-rc1 .30, update to latest.

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


1...<<31323334353637383940>>...50