aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/telephony/Makefile
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-24 01:03:34 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-24 01:03:34 -0400
commit75a95178dafb5c8d69b4abe45ea746a9cea23142 (patch)
tree1dbf80c83d9521dcdebc9e670f48da6c1ba34187 /drivers/telephony/Makefile
parent8531c5ffbca65f6df868637c26e6df6f88bff738 (diff)
parent0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf (diff)
Merge upstream into 'upstream' branch of netdev-2.6.git.
Hand fix merge conflict in drivers/net/tokenring/Kconfig.
Diffstat (limited to 'drivers/telephony/Makefile')
0 files changed, 0 insertions, 0 deletions