Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / include / trace / events / napi.h

diff --git a/include/trace/napi.h b/include/trace/events/napi.h
similarity index 100%
rename from include/trace/napi.h
rename to include/trace/events/napi.h