diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-06 13:03:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-06 13:03:52 -0700 |
| commit | 0fdf86754f70e813845af4abaa805165ce57a0bb (patch) | |
| tree | bafc26ec92dfe2ae430c0219882adb2c50578b1c /include/net/inet_connection_sock.h | |
| parent | 94c4fcec0144e032ef7d4ec761ab81d570b0bc2a (diff) | |
| parent | 147a27460366ecd35f1425f593cb42d52166c7ff (diff) | |
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
pcmcia: fix up alignf issues
Diffstat (limited to 'include/net/inet_connection_sock.h')
0 files changed, 0 insertions, 0 deletions