summaryrefslogtreecommitdiffstats
path: root/kernel/ptrace.c
diff options
context:
space:
mode:
authorLinus Torvalds2011-05-25 17:59:42 +0200
committerLinus Torvalds2011-05-25 17:59:42 +0200
commit22e12bbc9bc38c6d0bd541d061a0f547596fc19d (patch)
tree39b93f43b482c5b4cb9d99933384a8a7fcb85d71 /kernel/ptrace.c
parentMerge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff)
parentptp: Fix dp83640 build warning when building statically (diff)
downloadkernel-qcow2-linux-22e12bbc9bc38c6d0bd541d061a0f547596fc19d.tar.gz
kernel-qcow2-linux-22e12bbc9bc38c6d0bd541d061a0f547596fc19d.tar.xz
kernel-qcow2-linux-22e12bbc9bc38c6d0bd541d061a0f547596fc19d.zip
Merge branch 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: ptp: Fix dp83640 build warning when building statically ptp: Added a clock driver for the National Semiconductor PHYTER. ptp: Added a clock driver for the IXP46x. ptp: Added a clock that uses the eTSEC found on the MPC85xx. ptp: Added a brand new class driver for ptp clocks.
Diffstat (limited to 'kernel/ptrace.c')
0 files changed, 0 insertions, 0 deletions