Linus Torvalds
229aebb873
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
Update broken web addresses in arch directory.
Update broken web addresses in the kernel.
Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
Revert "Fix typo: configuation => configuration" partially
ida: document IDA_BITMAP_LONGS calculation
ext2: fix a typo on comment in ext2/inode.c
drivers/scsi: Remove unnecessary casts of private_data
drivers/s390: Remove unnecessary casts of private_data
net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
drivers/infiniband: Remove unnecessary casts of private_data
drivers/gpu/drm: Remove unnecessary casts of private_data
kernel/pm_qos_params.c: Remove unnecessary casts of private_data
fs/ecryptfs: Remove unnecessary casts of private_data
fs/seq_file.c: Remove unnecessary casts of private_data
arm: uengine.c: remove C99 comments
arm: scoop.c: remove C99 comments
Fix typo configue => configure in comments
Fix typo: configuation => configuration
Fix typo interrest[ing|ed] => interest[ing|ed]
Fix various typos of valid in comments
...
Fix up trivial conflicts in:
drivers/char/ipmi/ipmi_si_intf.c
drivers/usb/gadget/rndis.c
net/irda/irnet/irnet_ppp.c
|
2010-10-24 13:41:39 -07:00 |
| .. |
|
internal
|
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
|
2009-09-11 09:38:37 -07:00 |
|
aead.h
|
[CRYPTO] aead: Add top-level givencrypt/givdecrypt calls
|
2008-01-11 08:16:50 +11:00 |
|
aes.h
|
crypto: aes - Move key_length in struct crypto_aes_ctx to be the last field
|
2009-02-18 16:48:04 +08:00 |
|
algapi.h
|
crypto: skcipher - Add ablkcipher_walk interfaces
|
2010-05-19 14:13:07 +10:00 |
|
authenc.h
|
[CRYPTO] authenc: Move enckeylen into key itself
|
2008-01-11 08:16:30 +11:00 |
|
b128ops.h
|
[CRYPTO] lib: some common 128-bit block operations, nicely centralized
|
2006-12-06 18:38:55 -08:00 |
|
compress.h
|
crypto: zlib - New zlib crypto module, using pcomp
|
2009-03-04 15:16:19 +08:00 |
|
cryptd.h
|
crypto: cryptd - Adding the AEAD interface type support to cryptd
|
2010-09-20 16:05:12 +08:00 |
|
crypto_wq.h
|
crypto: api - Use dedicated workqueue for crypto subsystem
|
2009-02-19 14:33:40 +08:00 |
|
ctr.h
|
[CRYPTO] ctr: Refactor into ctr and rfc3686
|
2008-01-11 08:16:41 +11:00 |
|
des.h
|
[CRYPTO] des: Create header file for common macros
|
2008-01-11 08:16:02 +11:00 |
|
gf128mul.h
|
Update broken web addresses in the kernel.
|
2010-10-18 11:03:14 +02:00 |
|
hash.h
|
crypto: shash - Fix digest size offset
|
2009-07-15 21:16:05 +08:00 |
|
md5.h
|
crypto: md5 - Add export support
|
2010-01-17 21:55:31 +11:00 |
|
pcrypt.h
|
crypto: pcrypt - Add pcrypt crypto parallelization wrapper
|
2010-01-07 15:57:19 +11:00 |
|
rng.h
|
crypto: rng - RNG interface and implementation
|
2008-08-29 15:50:04 +10:00 |
|
scatterwalk.h
|
[CRYPTO] api: Fix scatterwalk_sg_chain
|
2008-05-01 18:22:28 +08:00 |
|
sha.h
|
crypto: sha512_generic - Use 64-bit counters
|
2009-07-22 14:38:13 +08:00 |
|
skcipher.h
|
[CRYPTO] skcipher: Add top-level givencrypt/givdecrypt calls
|
2008-01-11 08:16:49 +11:00 |
|
twofish.h
|
[CRYPTO] api: Get rid of flags argument to setkey
|
2006-09-21 11:41:02 +10:00 |
|
vmac.h
|
crypto: vmac - New hash algorithm for intel_txt support
|
2009-09-02 20:05:22 +10:00 |