summaryrefslogtreecommitdiffstats
path: root/net/caif
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-24 18:05:23 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-24 18:05:23 +0100
commit6d1e9a42e7176bbce9348274784b2e5f69223936 (patch)
tree628404d7cffd7ac8ab6629cf5052e21d50e86633 /net/caif
parentMerge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentMerge branches 'pstore-fixes' and 'syscalls2' into release (diff)
downloadlinux-6d1e9a42e7176bbce9348274784b2e5f69223936.tar.xz
linux-6d1e9a42e7176bbce9348274784b2e5f69223936.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: pstore: cleanups to pstore_dump() [IA64] New syscalls for 2.6.39
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions