diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:28:52 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:28:52 +0200 |
| commit | 09dd9b39abf85b8fae3ea105a81825478dd227b6 (patch) | |
| tree | 30e538d0fdd4739f246222a249db8b4f7f5ac0e1 /net/sctp/associola.c | |
| parent | 0420b32c01fda83e845752ca465584e21ebb4d3a (diff) | |
| parent | 56e580d7783ba49a50ccc1b1f3130e5ed2dc52e7 (diff) | |
| parent | fad107086d5a869c1c07e5bb35b7b57a10ecf578 (diff) | |
| parent | e1d62c9bd8779a8e4a335803f0fced9e614d0a9f (diff) | |
| parent | 226d3a151108970cb0c0c74c3a0ec2c073fdc186 (diff) | |
Merge branches 'davinci/cleanup', 'imx/cleanup', 'omap/cleanup' and 'pxa/cleanup' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/cleanup