diff options
author | David S. Miller <davem@davemloft.net> | 2009-06-01 23:32:08 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-01 23:32:08 +0200 |
commit | fc23ffe075365d2f21b1046048ad0d342bbb41be (patch) | |
tree | 164889c120908fbfeae36790f7bbee0271a30873 /kernel/trace/events.c | |
parent | 3c509: Add missing EISA IDs (diff) | |
parent | Bluetooth: Remove useless flush_work() causing lockdep warnings (diff) | |
download | linux-fc23ffe075365d2f21b1046048ad0d342bbb41be.tar.xz linux-fc23ffe075365d2f21b1046048ad0d342bbb41be.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'kernel/trace/events.c')
0 files changed, 0 insertions, 0 deletions