Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
[platform/adaptation/renesas_rcar/renesas_kernel.git] / Documentation / telephony /
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2