[XFS] Fix merge failures
[pandora-kernel.git] / crypto /
2008-12-29 Lachlan McIlroy[XFS] Fix merge failures
2008-12-29 Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild-next
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-nvram
2008-12-28 James MorrisMerge branch 'next' into for-linus
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-next-2.6
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git390.osdl.marist...
2008-12-28 Linus TorvaldsMerge branch 'sched-core-for-linus' of git://git./linux...
2008-12-28 Linus TorvaldsMerge branch 'tracing-core-for-linus' of git://git...
2008-12-28 Linus TorvaldsMerge branch 'x86-core-for-linus' of git://git./linux...
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2008-12-25 Ingo MolnarMerge branch 'sched/urgent'; commit 'v2.6.28' into...
2008-12-25 Ingo MolnarMerge branches 'tracing/ftrace', 'tracing/hw-branch...
2008-12-25 Ingo MolnarMerge branches 'x86/pat2' and 'x86/fpu'; commit 'v2...
2008-12-25 Takashi IwaiMerge branch 'topic/udev-id-rename' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/sound-core-fix' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/snd-hrtimer' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/pcxhr-update' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/oxygen' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/jack-mechanical' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/cs5535audio' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/convert-tasklet' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/ca0106' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/audigy-capture-boost' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/asoc' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/aoa' into to-push
2008-12-25 James MorrisMerge branch 'next' into for-linus
2008-12-25 Herbert Xucrypto: aes - Precompute tables
2008-12-25 Geert Uytterhoevencrypto: testmgr - Correct comment about deflate parameters
2008-12-25 Harvey Harrisoncrypto: salsa20 - Remove private wrappers around variou...
2008-12-25 Jarod Wilsoncrypto: des3_ede - permit weak keys unless REQ_WEAK_KEY set
2008-12-25 Adrian-Ken Rueegseggercrypto: sha512 - Switch to shash
2008-12-25 Adrian-Ken Rueegseggercrypto: sha512 - Move message schedule W[80] to static...
2008-12-25 Adrian-Ken Rueegseggercrypto: michael_mic - Switch to shash
2008-12-25 Adrian-Ken Rueegseggercrypto: wp512 - Switch to shash
2008-12-25 Adrian-Ken Rueegseggercrypto: tgr192 - Switch to shash
2008-12-25 Adrian-Ken Rueegseggercrypto: sha256 - Switch to shash
2008-12-25 Adrian-Ken Rueegseggercrypto: md5 - Switch to shash
2008-12-25 Adrian-Ken Rueegseggercrypto: md4 - Switch to shash
2008-12-25 Adrian-Ken Rueegseggercrypto: sha1 - Switch to shash
2008-12-25 Herbert Xucrypto: rmd320 - Switch to shash
2008-12-25 Herbert Xucrypto: rmd256 - Switch to shash
2008-12-25 Herbert Xucrypto: rmd160 - Switch to shash
2008-12-25 Herbert Xucrypto: rmd128 - Switch to shash
2008-12-25 Herbert Xucrypto: null - Switch to shash
2008-12-25 Herbert Xucrypto: hash - Make setkey optional
2008-12-25 Geert Uytterhoevencrypto: testmgr - Validate output length in (de)compres...
2008-12-25 Harvey Harrisoncrypto: remove uses of __constant_{endian} helpers
2008-12-25 Ingo Molnarcrypto: testmgr - Fix error flow of test_comp
2008-12-25 Jarod Wilsoncrypto: ansi_cprng - fix inverted DT increment routine
2008-12-25 Jarod Wilsoncrypto: ansi_cprng - Avoid incorrect extra call to...
2008-12-25 Julia Lawallcrypto: md4 - Use ARRAY_SIZE
2008-12-25 Herbert Xulibcrc32c: Move implementation to crypto crc32c
2008-12-25 Herbert Xucrypto: crc32c - Test descriptor context format
2008-12-25 Herbert Xucrypto: crc32c - Switch to shash
2008-12-25 Herbert Xucrypto: hash - Export shash through hash
2008-12-25 Herbert Xucrypto: api - Call type show function before legacy...
2008-12-25 Herbert Xucrypto: hash - Add import/export interface
2008-12-25 Herbert Xucrypto: hash - Export shash through ahash
2008-12-25 Herbert Xucrypto: hash - Add shash interface
2008-12-25 Herbert Xucrypto: api - Rebirth of crypto_alloc_tfm
2008-12-25 Herbert Xucrypto: api - Move type exit function into crypto_tfm
2008-12-25 Neil Hormancrypto: ansi_cprng - Allow resetting of DT value
2008-12-25 Harvey Harrisoncrypto: camellia - use kernel-provided bitops, unaligne...
2008-12-25 Neil Hormancrypto: testmgr - Trigger a panic when self test fails...
2008-12-24 Ingo MolnarMerge branch 'linus' into tracing/hw-branch-tracing
2008-12-24 Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-12-24 Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-12-24 Takashi IwaiMerge branch 'fix/hda' into topic/hda
2008-12-23 Ingo MolnarMerge branch 'x86/iommu' into x86/core
2008-12-23 Ingo MolnarMerge branch 'x86/tsc' into x86/core
2008-12-23 Ingo MolnarMerge branch 'x86/ptrace' into x86/tsc
2008-12-23 Ingo MolnarMerge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeat...
2008-12-23 Ingo MolnarMerge branch 'x86/apic' into x86/irq
2008-12-23 Ingo MolnarMerge commit 'v2.6.28-rc9' into x86/apic
2008-12-22 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-12-22 Lachlan McIlroy[XFS] Fix merge conflict in fs/xfs/xfs_rename.c
2008-12-20 Takashi IwaiMerge branch 'topic/ca0106-spdif-stream' into topic...
2008-12-20 Takashi IwaiMerge branch 'topic/ca0106-resume' into topic/ca0106
2008-12-20 Takashi IwaiMerge branch 'topic/ca0106-capture-no-44khz' into topic...
2008-12-20 Takashi IwaiMerge branch 'topic/hda-resume-fix' into topic/hda
2008-12-20 Takashi IwaiMerge branch 'topic/pcsp-fix' into topic/misc
2008-12-20 Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-12-19 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-12-19 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-19 Linus TorvaldsMerge branch 'for-linus' of git://neil.brown.name/md
2008-12-19 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-19 Takashi IwaiMerge branch 'fix/asoc' into for-linus
2008-12-19 Ingo MolnarMerge branches 'tracing/ftrace', 'tracing/ring-buffer...
2008-12-19 Takashi IwaiMerge branch 'topic/hda-doc' into topic/hda
2008-12-19 Takashi IwaiMerge branch 'fix/hda' into topic/hda
2008-12-18 Linus TorvaldsMerge branch 'fixes' of git://git./linux/kernel/git...
2008-12-18 Linus TorvaldsMerge branch 'fixes' of git://git./linux/kernel/git...
2008-12-18 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-12-17 Paul MackerrasMerge branch 'next' of /linux/kernel/git/jwboyer/powerp...
2008-12-16 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/uv
next