|
Revision tags: v2.6.28-rc9 |
|
| #
d110ec3a |
| 18-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/rcu
|
| #
78f902cc |
| 16-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc8' into x86/doc
|
| #
dd7a5230 |
| 16-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc8' into x86/cpufeature
|
| #
e18d7af8 |
| 12-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc8' into x86/mm
|
|
Revision tags: v2.6.28-rc8, v2.6.28-rc7 |
|
| #
3af4182c |
| 01-Dec-2008 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'upstream' into topic/asoc
|
| #
b5a20aa2 |
| 28-Nov-2008 |
Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
7fbb8759 |
| 26-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc6' into core/debug
|
| #
3e1d7a62 |
| 24-Nov-2008 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into core/futexes
|
| #
ca9eed76 |
| 23-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc6' into x86/debug
|
|
Revision tags: v2.6.28-rc6 |
|
| #
90accd6f |
| 20-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/memory-corruption-check
|
| #
fbc2a060 |
| 20-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/uv
|
| #
dba0a918 |
| 19-Nov-2008 |
David Vrabel <david.vrabel@csr.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
|
|
Revision tags: v2.6.28-rc5 |
|
| #
2b828925 |
| 14-Nov-2008 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
Conflicts:
security/keys/internal.h
security/keys/process_keys.c
security/keys/request_key.c
Fixed conflicts above by using the non 'tsk' versions.
Signed-off-by
Merge branch 'master' into next
Conflicts:
security/keys/internal.h
security/keys/process_keys.c
security/keys/request_key.c
Fixed conflicts above by using the non 'tsk' versions.
Signed-off-by: James Morris <jmorris@namei.org>
show more ...
|
| #
eb42c758 |
| 12-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/crashdump
|
| #
708b8eae |
| 12-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/locking
|
| #
486936cd |
| 11-Nov-2008 |
Paul Mackerras <paulus@samba.org> |
Merge branch 'linux-2.6' into next
|
| #
e0cb4ebc |
| 11-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'tracing/urgent' into tracing/ftrace
Conflicts:
kernel/trace/trace.c
|
| #
45b86a96 |
| 11-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
|
| #
4ecd33d9 |
| 10-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc4' into x86/apic
|
| #
a5a64498 |
| 10-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc4' into timers/rtc
Conflicts:
drivers/rtc/rtc-cmos.c
|
|
Revision tags: v2.6.28-rc4 |
|
| #
895e0317 |
| 08-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/cleanups
|
| #
258594a1 |
| 07-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'sched/urgent' into sched/core
|
| #
9eeda9ab |
| 07-Nov-2008 |
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/wireless/ath5k/base.c
net/8021q/vlan_core.c
|
| #
2bdf67eb |
| 06-Nov-2008 |
OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> |
fat: mmu_private race fix
mmu_private is 64bits value, hence it's not atomic to update.
So, the access rule for mmu_private is we must hold ->i_mutex. But,
fat_get_block() path doesn't follow the
fat: mmu_private race fix
mmu_private is 64bits value, hence it's not atomic to update.
So, the access rule for mmu_private is we must hold ->i_mutex. But,
fat_get_block() path doesn't follow the rule on non-allocation path.
This fixes by using i_size instead if non-allocation path.
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
| #
9e975dae |
| 06-Nov-2008 |
OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> |
fat: split include/msdos_fs.h
This splits __KERNEL__ stuff in include/msdos_fs.h into fs/fat/fat.h.
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@li
fat: split include/msdos_fs.h
This splits __KERNEL__ stuff in include/msdos_fs.h into fs/fat/fat.h.
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|