Merge branch 'sh/clkfwk' into sh-latest

2026-11-02 19:05:42 +00:00 · 2011-06-24 16:28:31 +09:00 · 2011-06-24 16:28:31 +09:00 · facbdce9a2
commit facbdce9a2
parent f448e9c9da 794d78fea5
53 changed files with 521 additions and 443 deletions
--- a/Documentation/power/devices.txt
+++ b/Documentation/power/devices.txt
--- a/Documentation/power/runtime_pm.txt
+++ b/Documentation/power/runtime_pm.txt
--- a/arch/mn10300/include/asm/uaccess.h
+++ b/arch/mn10300/include/asm/uaccess.h
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
--- a/drivers/infiniband/hw/cxgb4/cq.c
+++ b/drivers/infiniband/hw/cxgb4/cq.c
--- a/drivers/infiniband/hw/cxgb4/mem.c
+++ b/drivers/infiniband/hw/cxgb4/mem.c
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
--- a/drivers/infiniband/hw/qib/qib_iba7322.c
+++ b/drivers/infiniband/hw/qib/qib_iba7322.c
--- a/drivers/infiniband/hw/qib/qib_intr.c
+++ b/drivers/infiniband/hw/qib/qib_intr.c
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
--- a/drivers/sh/clk/core.c
+++ b/drivers/sh/clk/core.c
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
--- a/fs/ext4/ext4_extents.h
+++ b/fs/ext4/ext4_extents.h
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
--- a/fs/jbd2/checkpoint.c
+++ b/fs/jbd2/checkpoint.c
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
--- a/fs/jfs/file.c
+++ b/fs/jfs/file.c
--- a/fs/jfs/jfs_imap.c
+++ b/fs/jfs/jfs_imap.c
--- a/fs/jfs/jfs_incore.h
+++ b/fs/jfs/jfs_incore.h
--- a/fs/jfs/resize.c
+++ b/fs/jfs/resize.c
--- a/fs/lockd/clntproc.c
+++ b/fs/lockd/clntproc.c
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
--- a/fs/nfs/objlayout/objio_osd.c
+++ b/fs/nfs/objlayout/objio_osd.c
--- a/fs/nfs/objlayout/objlayout.c
+++ b/fs/nfs/objlayout/objlayout.c
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
--- a/fs/nfs/pnfs_dev.c
+++ b/fs/nfs/pnfs_dev.c
--- a/include/linux/device.h
+++ b/include/linux/device.h
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
--- a/include/linux/nfs_page.h
+++ b/include/linux/nfs_page.h
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c