projects
/
linux-2.6
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
[XFS] Fix merge failures
[linux-2.6]
/
net
/
netfilter
/
xt_socket.c
2008-12-28
Linus Torvalds
Merge git://git./linux/kernel/git/sam/kbuild-next
blob
|
commitdiff
|
raw
2008-12-28
Linus Torvalds
Merge git://git./linux/kernel/git/wim/linux-2.6-nvram
blob
|
commitdiff
|
raw
2008-12-28
James Morris
Merge branch 'next' into for-linus
blob
|
commitdiff
|
raw
2008-12-28
Linus Torvalds
Merge branch 'for-linus' of git://git./linux/kernel...
blob
|
commitdiff
|
raw
2008-12-25
Takashi Iwai
Merge branch 'topic/udev-id-rename' into to-push
blob
|
commitdiff
|
raw
2008-12-25
Takashi Iwai
Merge branch 'topic/snd-hrtimer' into to-push
blob
|
commitdiff
|
raw
2008-12-25
Takashi Iwai
Merge branch 'topic/pcxhr-update' into to-push
blob
|
commitdiff
|
raw
2008-12-25
Takashi Iwai
Merge branch 'topic/oxygen' into to-push
blob
|
commitdiff
|
raw
2008-12-25
Takashi Iwai
Merge branch 'topic/jack-mechanical' into to-push
blob
|
commitdiff
|
raw
2008-12-25
Takashi Iwai
Merge branch 'topic/cs5535audio' into to-push
blob
|
commitdiff
|
raw
2008-12-25
Takashi Iwai
Merge branch 'topic/audigy-capture-boost' into to-push
blob
|
commitdiff
|
raw
2008-12-25
Takashi Iwai
Merge branch 'topic/asoc' into to-push
blob
|
commitdiff
|
raw
2008-12-25
Takashi Iwai
Merge branch 'topic/aoa' into to-push
blob
|
commitdiff
|
raw
2008-12-25
James Morris
Merge branch 'next' into for-linus
blob
|
commitdiff
|
raw
2008-12-23
Ingo Molnar
Merge branch 'x86/iommu' into x86/core
blob
|
commitdiff
|
raw
2008-12-23
Ingo Molnar
Merge branch 'x86/ptrace' into x86/tsc
blob
|
commitdiff
|
raw
2008-12-23
Ingo Molnar
Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeat...
blob
|
commitdiff
|
raw
2008-12-23
Ingo Molnar
Merge commit 'v2.6.28-rc9' into x86/apic
blob
|
commitdiff
|
raw
2008-12-22
Lachlan McIlroy
[XFS] Fix merge conflict in fs/xfs/xfs_rename.c
blob
|
commitdiff
|
raw
2008-12-20
Takashi Iwai
Merge branch 'topic/ca0106-spdif-stream' into topic...
blob
|
commitdiff
|
raw
2008-12-20
Takashi Iwai
Merge branch 'topic/ca0106-resume' into topic/ca0106
blob
|
commitdiff
|
raw
2008-12-20
Takashi Iwai
Merge branch 'topic/ca0106-capture-no-44khz' into topic...
blob
|
commitdiff
|
raw
2008-12-20
Takashi Iwai
Merge branch 'topic/hda-resume-fix' into topic/hda
blob
|
commitdiff
|
raw
2008-12-20
Takashi Iwai
Merge branch 'topic/pcsp-fix' into topic/misc
blob
|
commitdiff
|
raw
|
diff to current
2008-12-19
Linus Torvalds
Merge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
blob
|
commitdiff
|
raw
2008-12-19
Takashi Iwai
Merge branch 'fix/asoc' into for-linus
blob
|
commitdiff
|
raw
2008-12-19
Ingo Molnar
Merge branches 'tracing/ftrace', 'tracing/ring-buffer...
blob
|
commitdiff
|
raw
2008-12-19
Takashi Iwai
Merge branch 'topic/hda-doc' into topic/hda
blob
|
commitdiff
|
raw
2008-12-19
Takashi Iwai
Merge branch 'fix/hda' into topic/hda
blob
|
commitdiff
|
raw
2008-12-18
Linus Torvalds
Merge branch 'fixes' of git://git./linux/kernel/git...
blob
|
commitdiff
|
raw
2008-12-18
Linus Torvalds
Merge branch 'fixes' of git://git./linux/kernel/git...
blob
|
commitdiff
|
raw
2008-12-18
Linus Torvalds
Merge git://git./linux/kernel/git/davem/sparc-2.6
blob
|
commitdiff
|
raw
2008-12-17
Paul Mackerras
Merge branch 'next' of /linux/kernel/git/jwboyer/powerp...
blob
|
commitdiff
|
raw
2008-12-16
Ingo Molnar
Merge commit 'v2.6.28-rc8' into x86/uv
blob
|
commitdiff
|
raw
2008-12-16
Ingo Molnar
Merge commit 'v2.6.28-rc8' into x86/doc
blob
|
commitdiff
|
raw
2008-12-16
Ingo Molnar
Merge commit 'v2.6.28-rc8' into x86/cpufeature
blob
|
commitdiff
|
raw
2008-12-16
David S. Miller
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
blob
|
commitdiff
|
raw
2008-12-16
Paul Mackerras
Merge branch 'merge' into next
blob
|
commitdiff
|
raw
2008-12-15
Linus Torvalds
Merge branch 'merge' of git://git./linux/kernel/git...
blob
|
commitdiff
|
raw
2008-12-13
Linus Torvalds
Merge branch 'merge' of git://git./linux/kernel/git...
blob
|
commitdiff
|
raw
2008-12-12
Ingo Molnar
Merge commit 'v2.6.28-rc8' into x86/irq
blob
|
commitdiff
|
raw
2008-12-12
Ingo Molnar
Merge commit 'v2.6.28-rc8' into x86/mm
blob
|
commitdiff
|
raw
2008-12-12
Ingo Molnar
Merge commit 'v2.6.28-rc8' into sched/core
blob
|
commitdiff
|
raw
2008-12-10
Linus Torvalds
Merge branch 'sched-fixes-for-linus' of git://git....
blob
|
commitdiff
|
raw
2008-12-10
Linus Torvalds
Merge branch 'upstream' of git://ftp.linux-mips.org...
blob
|
commitdiff
|
raw
2008-12-09
Linus Torvalds
Merge master.kernel.org:/home/rmk/linux-2.6-arm
blob
|
commitdiff
|
raw
2008-12-09
Linus Torvalds
Merge git://git.infradead.org/mtd-2.6
blob
|
commitdiff
|
raw
2008-12-09
Linus Torvalds
Merge branch 'audit.b59' of git://git./linux/kernel...
blob
|
commitdiff
|
raw
2008-12-09
Linus Torvalds
Merge branch 'drm-fixes' of git://git./linux/kernel...
blob
|
commitdiff
|
raw
2008-12-09
Linus Torvalds
Merge branch 'merge' of git://git./linux/kernel/git...
blob
|
commitdiff
|
raw
2008-12-09
Linus Torvalds
Merge git://git./linux/kernel/git/davem/net-2.6
blob
|
commitdiff
|
raw
2008-12-08
Balazs Scheidler
tproxy: fixe a possible read from an invalid location...
blob
|
commitdiff
|
raw
2008-11-30
Linus Torvalds
Merge branch 'for-linus' of git://git./linux/kernel...
blob
|
commitdiff
|
raw
|
diff to current
2008-11-26
Takashi Iwai
Merge branch 'topic/misc' into topic/pcsp-fix
blob
|
commitdiff
|
raw
|
diff to current
2008-11-25
Takashi Iwai
Merge branch 'topic/fix/hda' into for-linus
blob
|
commitdiff
|
raw
|
diff to current
2008-11-21
Takashi Iwai
Merge branches 'topic/fix/hda' and 'topic/fix/sound...
blob
|
commitdiff
|
raw
|
diff to current
2008-11-18
Takashi Iwai
Merge branches 'topic/fix/hda' and 'topic/fix/misc...
blob
|
commitdiff
|
raw
|
diff to current
2008-11-12
Takashi Iwai
Merge branch 'topic/fix/hda' into for-linus
blob
|
commitdiff
|
raw
|
diff to current
2008-11-10
Takashi Iwai
Merge branches 'topic/fix/misc' and 'topic/fix/hda...
blob
|
commitdiff
|
raw
|
diff to current
2008-11-06
Linus Torvalds
Merge branch 'for-linus' of git://git./linux/kernel...
blob
|
commitdiff
|
raw
|
diff to current
2008-11-06
Ingo Molnar
Merge branch 'iommu-fixes-2.6.28' of git://git./linux...
blob
|
commitdiff
|
raw
|
diff to current
2008-11-05
James Morris
Merge branch 'master' into next
blob
|
commitdiff
|
raw
|
diff to current
2008-11-03
Takashi Iwai
Merge branches 'topic/fix/misc' and 'topic/fix/hda...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-31
Takashi Iwai
Merge commit 'v2.6.28-rc2' into topic/asoc
blob
|
commitdiff
|
raw
|
diff to current
2008-10-30
Takashi Iwai
Merge branches 'topic/fix/misc' and 'topic/fix/asoc...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-29
Takashi Iwai
Merge branches 'topic/fix/hda' and 'topic/fix/misc...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-28
Ingo Molnar
Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-28
Paul Mundt
Merge branches 'sh/serial-rework' and 'sh/oprofile'
blob
|
commitdiff
|
raw
|
diff to current
2008-10-27
Linus Torvalds
Merge branch 'for-linus' of git://git./linux/kernel...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-27
Takashi Iwai
Merge branches 'topic/fix/asoc', 'topic/fix/hda', ...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-26
Linus Torvalds
Merge branch 'for-linus' of git://git./linux/kernel...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-25
Len Brown
Merge branch 'i7300_idle' into release
blob
|
commitdiff
|
raw
|
diff to current
2008-10-23
Takashi Iwai
Merge branches 'topic/asoc', 'topic/misc-fixes' and...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-23
Linus Torvalds
Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfiel...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-23
Linus Torvalds
Merge branch 'for-linus' of git://git./linux/kernel...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-23
Haavard Skinnemoen
Merge branches 'boards' and 'fixes' of git://git./linux...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-23
Len Brown
Merge branch 'linus' into test
blob
|
commitdiff
|
raw
|
diff to current
2008-10-20
Linus Torvalds
Merge git://git./linux/kernel/git/kyle/parisc-2.6
blob
|
commitdiff
|
raw
|
diff to current
2008-10-20
Linus Torvalds
Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
blob
|
commitdiff
|
raw
|
diff to current
2008-10-20
Linus Torvalds
Merge branch 'next' of git://git./linux/kernel/git...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-20
Linus Torvalds
Merge branch 'linux-next' of git://git.infradead.org...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-20
Linus Torvalds
Merge git://git.infradead.org/mtd-2.6
blob
|
commitdiff
|
raw
|
diff to current
2008-10-20
David Vrabel
Merge branch 'master' into for-upstream
blob
|
commitdiff
|
raw
|
diff to current
2008-10-20
Takashi Iwai
Merge branches 'topic/asoc', 'topic/misc-fixes', 'topic...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-20
Thomas Gleixner
Merge branch 'for-linus' of git://git./linux/kernel...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-20
Thomas Gleixner
Merge branches 'timers/clocksource', 'timers/hrtimers...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-20
Paul Mundt
Merge branch 'master' of git://git./linux/kernel/git...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-18
Anton Vorontsov
Merge branch 'master' of git://git./linux/kernel/git...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-17
Tony Luck
Pull utrace into release branch
blob
|
commitdiff
|
raw
|
diff to current
2008-10-17
Linus Torvalds
Merge git://git./linux/kernel/git/gregkh/staging-2.6
blob
|
commitdiff
|
raw
|
diff to current
2008-10-17
Linus Torvalds
Merge branch 'for-linus' of git://git./linux/kernel...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-17
Arjan van de Ven
Merge commit 'linus/master' into merge-linus
blob
|
commitdiff
|
raw
|
diff to current
2008-10-17
Linus Torvalds
Merge branch 'for-linus' of git://www.jni.nu/cris
blob
|
commitdiff
|
raw
|
diff to current
2008-10-17
Ingo Molnar
Merge branch 'linus' into sched/urgent
blob
|
commitdiff
|
raw
|
diff to current
2008-10-16
Linus Torvalds
Merge branch 'sched-fixes-for-linus' of git://git....
blob
|
commitdiff
|
raw
|
diff to current
2008-10-16
Linus Torvalds
Merge branch 'for-linus' of git://git./linux/kernel...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-16
Linus Torvalds
Merge branch 'for-linus' of git://git./linux/kernel...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-16
Linus Torvalds
Merge branch 'agp-next' of git://git./linux/kernel...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-16
Linus Torvalds
Merge branch 'docs' of git://git.lwn.net/linux-2.6
blob
|
commitdiff
|
raw
|
diff to current
2008-10-16
Linus Torvalds
Merge branch 'for-linus' of git://git./linux/kernel...
blob
|
commitdiff
|
raw
|
diff to current
next